Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
default.nix	tor: update from 0.2.4.22 to 0.2.4.23	2014-07-31 14:36:06 +03:00
torbrowser.nix
torsocks.nix	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00