nixpkgs/pkgs/tools/security/tor
Vladimír Čunát dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
..
default.nix unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
tor-arm.nix tor-arm: kill tabs 2014-12-10 04:21:14 -06:00
torbrowser.nix Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
torsocks.nix nixpkgs: torsocks 1.3 -> 2.0.0 2014-12-06 05:00:26 -06:00