nixpkgs/pkgs/tools/security/tor
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
default.nix tor: 0.4.0.5 -> 0.4.1.5 2019-08-22 13:21:58 -05:00
tor-arm.nix treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
torsocks.nix treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
update.nix