alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
82910 commits 217 branches 121 tags 4.5 GiB
Commit graph

71894 commits

Author SHA1 Message Date
Franz Pletz 4825d4033e ddrescue: 1.20 -> 1.21 2016-05-03 16:15:20 +02:00
Franz Pletz b5fdb8585b di: 4.36 -> 4.37 2016-05-03 16:15:20 +02:00
Franz Pletz 9da6390bae ethtool: 4.0 -> 4.5 2016-05-03 16:15:20 +02:00
Franz Pletz b8aaa3f130 fping: 3.10 -> 3.13 2016-05-03 16:15:20 +02:00
Franz Pletz d5dd5e05f1 glxinfo: 8.1.0 -> 8.3.0 2016-05-03 16:15:20 +02:00
Franz Pletz d1998b93d7 lftp: 4.6.4 -> 4.7.1 2016-05-03 16:15:20 +02:00
Franz Pletz 1ec3e71971 libdvdread: 5.0.2 -> 5.0.3 2016-05-03 16:15:20 +02:00
Franz Pletz 18964796e6 mc: 4.8.12 -> 4.8.16 2016-05-03 16:15:20 +02:00
Franz Pletz d7338bf9d7 msmtp: 1.6.2 -> 1.6.4 2016-05-03 16:15:20 +02:00
Franz Pletz dd3c18fe22 openh264: 1.4.0 -> 1.5.0 2016-05-03 16:15:20 +02:00
Franz Pletz b701ea82e7 netperf: 2.6.0 -> 2.7.0 2016-05-03 16:15:20 +02:00
Franz Pletz 50884acd84 lzip: 1.16 -> 1.17 2016-05-03 16:15:20 +02:00
Franz Pletz dc576f9403 libxmp: 4.3.11 -> 4.3.12 2016-05-03 16:15:20 +02:00
Franz Pletz 57b5c22feb libsecret: 0.18 -> 0.18.5 2016-05-03 16:15:20 +02:00
Franz Pletz 7386619538 libseccomp: 2.2.3 -> 2.3.0 2016-05-03 16:15:20 +02:00
Franz Pletz c3df9b0650 libnl: 3.2.26 -> 3.2.27 2016-05-03 16:15:20 +02:00
Franz Pletz 9f99116772 libnatspec: 0.2.6 -> 0.3.0 2016-05-03 16:15:20 +02:00
Franz Pletz b4a5bb3d4b libev: 4.20 -> 4.22 2016-05-03 16:15:20 +02:00
Franz Pletz 7ac522ad83 libevdev: 1.4.5 -> 1.4.6 2016-05-03 16:15:20 +02:00
Franz Pletz 0ab30ecf06 libopus: 1.1 -> 1.1.2 2016-05-03 16:15:20 +02:00
Franz Pletz 117920233f flashrom: 0.9.7 -> 0.9.9 2016-05-03 16:15:20 +02:00
Franz Pletz 669cd2adbf lighttpd: 1.4.37 -> 1.4.39 2016-05-03 16:15:20 +02:00
Franz Pletz 13b9d32917 libu2f-host: 1.0.0 -> 1.1.1 2016-05-03 16:15:20 +02:00
Franz Pletz bc233fa54e arandr: 0.1.8 -> 0.1.9 2016-05-03 16:15:20 +02:00
Franz Pletz ed64199876 libdwg: 0.3 -> 0.6 2016-05-03 16:15:20 +02:00
Franz Pletz 47a7b42d51 collectd: 5.5.0 -> 5.5.1 2016-05-03 16:15:20 +02:00
Franz Pletz d8230abeed libass: 0.12.2 -> 0.13.2 2016-05-03 16:15:20 +02:00
Franz Pletz e027ef7cb8 iw: 4.1 -> 4.3 2016-05-03 16:15:20 +02:00
Franz Pletz e07b06d12a tgt: 1.0.60 -> 1.0.63 2016-05-03 16:15:20 +02:00
Franz Pletz a6fdcea877 cimg: 1.5.9 -> 1.7.0 2016-05-03 16:15:20 +02:00
Joachim Fasting b9fc31a415
popcorntime: mark as broken 
A temporary measure, short of removal, until
https://github.com/NixOS/nixpkgs/issues/15120 has been resolved.
 2016-05-03 16:09:36 +02:00
Franz Pletz ffdcdb5124 znapzend: 0.15.3 -> 0.15.5 2016-05-03 16:05:14 +02:00
Franz Pletz c0f4361902 php: Fix openssl module build 2016-05-03 16:04:40 +02:00
Franz Pletz 70ac1ec422 dovecot: 2.2.21 -> 2.2.24 2016-05-03 16:03:41 +02:00
Franz Pletz d092838a1c postfix: 3.0.3 -> 3.0.4 2016-05-03 16:03:41 +02:00
Franz Pletz 9139cf7d3f Merge pull request #15188 from avnik/rspamd 
Rspamd+rmilter update
 2016-05-03 15:06:11 +02:00
Alexander V. Nikolaev 7dea8d17a7 rmilter: 1.8.1 -> 1.8.4 2016-05-03 15:34:20 +03:00
Alexander V. Nikolaev 6f7fdda06e rspamd: 1.2.5 -> 1.2.6 2016-05-03 15:29:48 +03:00
Arseniy Seroka e681d9f51e Merge pull request #15186 from romildo/new.greybird 
Greybird: init at 2016-03-11
 2016-05-03 14:24:55 +03:00
vbgl a95df7d800 Merge pull request #15106 from vbgl/camlp5-6.16 
camlp5: 6.14 -> 6.16
 2016-05-03 12:56:16 +02:00
Nikolay Amiantov fe0bb1efd1 imagemagick: add webp support 2016-05-03 13:19:41 +03:00
José Romildo Malaquias 4b2caa2409 Greybird: init at 2016-03-11 2016-05-03 06:45:17 -03:00
Robin Gloster 2ef7fbe4a0 Merge pull request #15185 from hrdinka/update/nsd 
nsd: 4.1.7 -> 4.1.9
 2016-05-03 11:44:54 +02:00
Robin Gloster f9eb376eae Merge pull request #15178 from NeQuissimus/jdk8u92 
[WIP/Pretty big rebuild] openjdk: 8u76 -> 8u92
 2016-05-03 11:23:44 +02:00
rardiol 0ba62f7150 spring, springlobby update (#15182) 
* alure: init at 1.2

* spring: 96.0 -> 101.0

* springlobby: 0.195 -> 0.247
 2016-05-03 10:19:19 +01:00
Guillaume Maudoux 2362891dc8 Just strip everything by default 
Run strip of each file and discard expected failure types.
Also default to stripping the entire output.
 2016-05-03 11:04:34 +02:00
Edward Tjörnhammar 066b5cb11a
idea.idea-{community,ultimate}: 2016.1 -> 2016.1.1 2016-05-03 11:01:21 +02:00
Peter Simons 66ff540ee6 haskell-lens: update version used by GHC 8.0.x 2016-05-03 10:22:22 +02:00
Peter Simons 967901f195 haskell-binary: update version used for GHC releases prior to 7.8.x 2016-05-03 10:22:22 +02:00
Peter Simons ddb8c06c2d haskell-yi: mark as broken 2016-05-03 10:22:22 +02:00
Peter Simons ec49307518 haskell-hakyll: fix test suite by providing "rev" in test environment 2016-05-03 10:22:22 +02:00
Peter Simons f6980571ab Add LTS Haskell 5.15. 2016-05-03 10:22:22 +02:00
Peter Simons f622804472 Add LTS Haskell 5.14. 2016-05-03 10:22:22 +02:00
Peter Simons 372782d1f0 hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20160406-5-gcb85ef4 using the following inputs:

  - Hackage: 24af5f79f4
  - LTS Haskell: 4d628b7b7e
  - Stackage Nightly: 2b431f312c
 2016-05-03 10:22:15 +02:00
Robin Gloster 8fc0e7f64d Merge pull request #15180 from groxxda/bump/bind9 
bind: 9.10.3-P4 -> 9.10.4
 2016-05-03 09:58:23 +02:00
Vincent Laporte a42f845925 coq-dpdgraph: init at 0.5 2016-05-03 09:27:16 +02:00
Alexander Ried 6ca5c3667b kde: cleanup from closure-size merge (#15179) 
part of 98d8e1a160 and
7049bde4d5 got lost
 2016-05-03 08:59:18 +02:00
Alexander Ried 5be72c23ea bind: LibreSSL compatibility added upstream 2016-05-03 04:58:01 +02:00
Alexander Ried 19ce448380 bind: 9.10.3-P4 -> 9.10.4 2016-05-03 04:58:01 +02:00
Tobias Geerinckx-Rice be3d012da4
highlight: 3.18 -> 3.28 2016-05-03 04:33:49 +02:00
Tobias Geerinckx-Rice 078f14e058
hicolor_icon_theme: 0.14 -> 0.15 2016-05-03 04:31:20 +02:00
Tobias Geerinckx-Rice 49fd7d9d08
autoconf-archive: 2015.09.25 -> 2016.03.20 2016-05-03 04:21:44 +02:00
Tobias Geerinckx-Rice 7a595cdfc3
libpwquality: 1.2.3 -> 1.3.0 2016-05-03 04:11:44 +02:00
Tobias Geerinckx-Rice 9c7f71cd61
unarj: 2.63a -> 2.65 2016-05-03 04:00:25 +02:00
Tobias Geerinckx-Rice 95aab50e81
efivar: 0.21 -> 0.23 2016-05-03 03:50:13 +02:00
Tobias Geerinckx-Rice 41de2cacb8
perlPackages.Thread-Queue: 3.05 -> 3.09 2016-05-03 03:31:25 +02:00
Tobias Geerinckx-Rice 15af160ec0
perlPackages.threads-shared: 1.48 -> 1.51 2016-05-03 03:30:56 +02:00
Tobias Geerinckx-Rice b2ea81bd0f
perlPackages.threads: 2.02 -> 2.07 2016-05-03 03:30:27 +02:00
Tobias Geerinckx-Rice 78c500a8d1
perlPackages.PerlIO-eol: 0.14 -> 0.16 2016-05-03 03:29:34 +02:00
Tobias Geerinckx-Rice 5d25d7d987
rescuetime: use makeLibraryPath for LD_PRELOAD hack 2016-05-03 03:01:46 +02:00
Tobias Geerinckx-Rice 21b667e066
rescuetime: 2.8.9.1170 -> 2.9.10.1255 2016-05-03 02:43:03 +02:00
obadz 8536d8b4ed tcpflow: 1.4.5 -> 1.4.6 (#15151) 
Switch to fetchFromGitHub as website does not have latest version.
Default to not building against cairo to avoid dependencies on lots
of graphic libraries for a predominently command-line application.
 2016-05-03 01:39:46 +01:00
Tim Steinbach 84bf43a702 openjdk: 8u76 -> 8u92 2016-05-03 00:17:45 +00:00
Tobias Geerinckx-Rice 69ef7566a8
wireless-regdb: 2016-02-08 -> 2016-05-02 2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice d6c3407f7b
btrfs-progs: 4.5.1 -> 4.5.2 2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice 6b6463dbd2
dpkg: 1.18.4 -> 1.18.5 2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice bc4465e23f
pythonPackages.sqlparse: 0.1.16 -> 0.1.18 2016-05-03 02:01:12 +02:00
Lluís Batlle i Rossell 94520a25ad Adding blktrace 
Tool to get traces of operations in block devices on linux.
 2016-05-03 00:26:27 +02:00
Tuomas Tynkkynen c2caf86d21 Merge pull request #15176 from Baughn/mono 
mono: Update libX11 location
 2016-05-03 01:23:13 +03:00
Svein Ove Aas 5e0e2e6692 mono: Update libX11 location 2016-05-02 23:09:06 +01:00
Bart Brouns 57d9fd8f65 linuxband: init at 12.02.1 2016-05-02 23:28:32 +02:00
Arseniy Seroka ee15d443c1 Merge pull request #15170 from magnetophon/MMA 
MMA: init at 15.12
 2016-05-03 00:23:19 +03:00
Tristan Helmich 7ec3023141 emby: 3.0.5932 -> 3.0.5934 (#15173) 2016-05-02 23:00:10 +02:00
Brad Ediger 6e353bb17f ruby: update 2.3 series to 2.3.1 2016-05-02 15:49:05 -05:00
Bart Brouns bdf7f03c4b MMA: init at 15.12 2016-05-02 21:04:07 +02:00
Thomas Tuegel 014d853f8c julia: remove ttuegel from maintainers 
ttuegel has not used julia in some time.
 2016-05-02 13:55:21 -05:00
Shea Levy edb0b7e36f krb5: 1.14 -> 1.14.2 (security updates) 2016-05-02 14:19:37 -04:00
Thomas Tuegel f04e0e70e8 Revert "Revert "dbus: 1.8.20 -> 1.10.8"" 
This reverts commit 9eb107dc52.
 2016-05-02 13:01:59 -05:00
aszlig 0d5ff13701
beets: Merge pull request #15165: Fix ffmpeg call 
This patches the ffmpeg command path so that it will work without ffmpeg
being in the user's current path. The commit contains a suggestion from
me to patch command_output() instead of just replacing "ffmpeg" so that
if a user configuration alters the default commands it will still work.
 2016-05-02 18:56:19 +02:00
Profpatsch 1a350e6b58 beets: patch ffmpeg invocation in convert plugin 
The default convert configuration invokes ffmpeg, so this patches in the
right storepath. Since it patches the shlex split, even user config will
use the correct path. kudos @aszlig.
 2016-05-02 18:39:46 +02:00
Tobias Geerinckx-Rice f03fdb0f56
perlPackages.Gtk2: 1.2497 -> 1.2498 2016-05-02 17:39:08 +02:00
Tobias Geerinckx-Rice 3a0481d3c4
perlPackages.Glib: 1.320 -> 1.321 2016-05-02 17:39:08 +02:00
Tobias Geerinckx-Rice 2adcd6db80
perlPackages.Pango: 1.226 -> 1.227 2016-05-02 17:39:08 +02:00
Christoph Hrdinka 199c998bcc nsd: 4.1.7 -> 4.1.9 
Features
========

* Fix #732: tcp-mss, outgoing-tcp-mss options for nsd.conf, patch from Daisuke Higashi.
* Fix #739: zonefile changes when mtime is small are detected on reload, if filesystem supports precision mtime values.
* RR type CSYNC (RFC7477) syntax is supported.

Bugfixes
========

* Change the nsd.db file version because of nanosecond precision fix.
* take advantage of arc4random_uniform if available, patch from Loganaden Velvindron.
* Fix flto check for OSX clang.
* Define _DEFAULT_SOURCE with _BSD_SOURCE for glibc 2.20 on Linux.
* Fix #736: segfault during zone transfer.
* Fix #744: Fix that NSD replies for configured but unloaded zone with SERVFAIL, not REFUSED.
 2016-05-02 16:46:46 +02:00
Tobias Geerinckx-Rice e8c6b47ee3
yodl: 3.07.01 -> 3.08.00 2016-05-02 16:33:53 +02:00
Kovacsics Robert 8a1ccb5f70 plover: 2.5.8 -> 3.0.0 (#15140) 2016-05-02 16:09:06 +02:00
Nikolay Amiantov 7fec04cd7f Merge pull request #15129 from rardiol/openra 
openra: 20141029 -> 20151224
 2016-05-02 16:28:20 +04:00
Tobias Geerinckx-Rice 6cff7111d0
geolite-legacy: 2016-04-29 -> 2016-05-02 2016-05-02 13:53:32 +02:00
Kamil Chmielewski 43e617b487 matchbox: update source urls + libmatchbox: 1.9 -> 1.11 (#15160) 2016-05-02 12:26:32 +02:00
Jascha Geerds cf224573d6 idea.pycharm: 5.0.3 -> 2016.1.2 2016-05-02 11:59:31 +02:00
Joachim Fasting a7886c9189 bittorrentSync20: 2.3.3 -> 2.3.6 (#15147) 
Note that this changes the domain from getsyncapp.com (no longer valid)
to getsync.com.
 2016-05-02 11:57:17 +02:00
Robin Gloster 1ea32f8235 Merge pull request #15158 from joachifm/grsecurity 
Grsecurity updates & improvements
 2016-05-02 11:56:11 +02:00
Robin Gloster 5a2b26cf7b Merge pull request #15056 from simonvandel/fix-qbittorent-qmake 
Fix qbittorent qmake build error
 2016-05-02 11:35:09 +02:00
Joachim Fasting 39db90eaf6
grsecurity: simplify preConfigure 2016-05-02 11:28:06 +02:00
Joachim Fasting a69501a936
grsecurity: ensure that PaX ELF markings are enabled 
The upstream default is to enable only xattr markings, breaking the
paxmarks facility.
 2016-05-02 11:28:06 +02:00
Joachim Fasting 7893cb1aea
linuxPackages_grsec_4_1: delete 
Upstream supports 3.14, 4.4, and 4.5
 2016-05-02 11:28:05 +02:00
Joachim Fasting fecb56fc3f
linuxPackages_grsec_4_5: init at 3.1-4.5.2-201604290633 2016-05-02 11:28:05 +02:00
Stefan Junker 3829bcf866 vim-go: 2016-04-15 -> 2016-05-01 (#15157) 2016-05-02 11:09:04 +02:00
Eelco Dolstra 8a854c2647 Merge pull request #15111 from rardiol/subversionPerl 
subversion: fix apr-1 linking related to #14495
 2016-05-02 10:56:28 +02:00
Bob van der Linden 69d5f27a13 popcorntime: 0.3.8 -> 0.4.0-2 (#15154) 2016-05-02 10:46:37 +02:00
Joachim Fasting ae59e8c644 Merge pull request #15062 from holidaycheck/node-6.0.0 
nodejs-6_x : init at 6.0.0
 2016-05-02 09:53:18 +02:00
Tobias Pflug 822abc49ad nodejs-6_x : init at 6.0.0 2016-05-02 08:58:50 +02:00
Joachim Fasting 4054bf05ad Merge pull request #15150 from ryneeverett/you-get-init 
you-get: init at 0.4.390
 2016-05-02 08:38:06 +02:00
ryneeverett 1e84b0c070 you-get: init at 0.4.390 2016-05-02 06:21:42 +00:00
Joachim Fasting d985db9cef Merge pull request #15141 from matthiasbeyer/update-buku 
buku: 1.8 -> 1.9
 2016-05-02 04:58:55 +02:00
Joachim Fasting 3ad29e237a Merge pull request #14905 from nico202/Oger 
Oger: init at 1.1.3 with dependencies
 2016-05-02 04:56:12 +02:00
Joachim Fasting 8a19984006 Merge pull request #15149 from kragniz/linux-testing-4.6-rc6 
linux-testing: 4.6-rc5 -> 4.6-rc6
 2016-05-02 04:51:17 +02:00
Joachim Fasting 9560a9b767 Merge pull request #15072 from rimmington/v8-arm 
v8: Build 3.16.14 on ARM
 2016-05-02 04:30:54 +02:00
Joachim Fasting 3e750abb0c Merge pull request #15057 from vbgl/gobject-introspection-on-dawin 
gobject-introspection: fix on darwin
 2016-05-02 03:52:54 +02:00
Louis Taylor 80f923f26f linux-testing: 4.6-rc5 -> 4.6-rc6 2016-05-02 02:29:42 +01:00
Joachim Fasting d27848abb2 Merge pull request #14924 from simonvandel/fix-jmc 
Oracle Java Mission Control: fix startup
 2016-05-02 03:27:16 +02:00
Joachim Fasting 889f36498f Merge pull request #15088 from cstrahan/redis-desktop-manager 
redis-desktop-manager: init at 0.8.3
 2016-05-02 03:26:19 +02:00
Joachim Fasting 43c406fb24 Merge pull request #15069 from NeQuissimus/kernel46rc5 
linux_testing: 4.6-rc4 -> 4.6-rc5
 2016-05-02 03:25:20 +02:00
Joachim Fasting e1197f6896 Merge pull request #15082 from namore/init_rake 
rake: init at 11.1.1
 2016-05-02 03:20:51 +02:00
Tobias Geerinckx-Rice 232d2f29ac
pythonPackages.mycli: 1.4.0 -> 1.6.0 2016-05-02 02:31:45 +02:00
Tobias Geerinckx-Rice 230a0d4cc6
pythonPackages.pgcli: 0.19.2 -> 0.20.1 2016-05-02 02:31:45 +02:00
Tobias Geerinckx-Rice b9e42f1b9a
pythonPackages.pgspecial: init at 1.3.0 2016-05-02 02:31:45 +02:00
Tobias Geerinckx-Rice 5689ab480a
pythonPackages.prompt_toolkit: 0.46 -> 0.60 2016-05-02 02:31:45 +02:00
Tobias Geerinckx-Rice b68f09a520
pythonPackages.boto3: 1.2.2 -> 1.3.1 2016-05-02 02:31:45 +02:00
Tobias Geerinckx-Rice 1b7e3ee149
pythonPackages.wcwidth: 0.1.4 -> 0.1.6 2016-05-02 02:31:45 +02:00
Joachim Fasting f125da3909 Merge pull request #15123 from redbaron/remove-scatter-output-hook 
Remove obsolete scatter output hook
 2016-05-02 02:24:08 +02:00
Nikolay Amiantov 8297d2c60c Merge pull request #15124 from nathan7/master 
minecraft: use makeLibraryPath, so we don't use the dev outputs
 2016-05-02 04:14:27 +04:00
Nathan Zadoks ddb4ea19bc minecraft: use makeLibraryPath, so we don't use the dev outputs 2016-05-01 20:13:20 -04:00
Austin Seipp a1d61e7367 nixpkgs: fix chez build failures 
The Chez build was failing, as usual, due to impurities. The build
system refers to absolute paths for tools like `ln` or `true`, which
was the real culprit here. Furthermore the build also 'helpfully'
suppresses errors in these cases by piping to /dev/null, so you never
see any errors at build time until it's too late (otherwise, you'd
see failures to call /bin/ln or at ./configure time).

This also re-enables parallel builds, as they should be safe from
all my testing, I believe.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2016-05-01 22:15:42 +00:00
Tuomas Tynkkynen 30240ccb9d tarball: No need to depend on nix development headers 2016-05-02 01:06:45 +03:00
Ricardo Ardissone 42cce6ab11 openra: my maintainership 2016-05-01 19:03:07 -03:00
Ricardo Ardissone d19841c46f openra: 20141029 -> 20151224 2016-05-01 19:03:02 -03:00
Tuomas Tynkkynen 36c4c73575 clang: Add compat lib attribute to have stdenv.cc.cc.lib always work 
Fixes tarball evaluation:

http://hydra.nixos.org/build/35042997/nixlog/1/raw
 2016-05-02 00:57:28 +03:00
Robert Helgesson ef44e78849 perl-Pod-Weaver: 4.012 -> 4.013 2016-05-01 23:36:41 +02:00
Robert Helgesson 50a8d9a6f4 perl-Pod-Elemental-PerlMunger: 0.200005 -> 0.200006 2016-05-01 23:36:41 +02:00
Robert Helgesson 196c422186 perl-Math-BigRat: 0.260803 -> 0.260804 2016-05-01 23:36:41 +02:00
Robert Helgesson 97e5e01463 perl-Math-BigInt: 1.999718 -> 1.999722 2016-05-01 23:36:41 +02:00
Robert Helgesson 216b04b247 perl-Log-Dispatchouli: 2.009 -> 2.012 2016-05-01 23:36:41 +02:00
Robert Helgesson 1612bb4123 perl-File-Util: 4.132140 -> 4.161200 2016-05-01 23:36:41 +02:00
Robert Helgesson 452867d149 perl-CryptX: 0.030 -> 0.031 2016-05-01 23:36:41 +02:00
Joachim Fasting 0ad1c9788a Merge pull request #15133 from bobvanderlinden/fix-nwjs-popcorntime 
nwjs: use correct nwEnv and rpath
 2016-05-01 22:36:50 +02:00
Austin Seipp d9ad7d529d nixpkgs: remove unused hiphopvm/hhvm alias 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2016-05-01 20:17:56 +00:00
Austin Seipp 966a790764 nixpkgs: chez scheme update 
Remove the parallel build[1], and update to the latest commit which
updates the .boot files and fixes a few bugs, too.

[1] I figured many builds on my dual-socket 12core would expose
problems, but I have a suspicion of that being an issue.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2016-05-01 20:14:51 +00:00
Joachim Fasting 979de54175 Merge pull request #15122 from Ralith/rtags 
rtags: 9fed420 -> 233543d
 2016-05-01 22:11:43 +02:00
Joachim Fasting 0a04f7a870
torbrowser: fix paths to pluggable transports 
With this patch I'm at least able to connect using the obfs4 transport
 2016-05-01 21:27:25 +02:00