Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ... Let's get rid of those merge conflicts.		2016-02-03 16:57:19 +01:00
..
default.nix	tor: 0.2.7.5 -> 0.2.7.6	2015-12-27 07:20:14 +00:00
tor-arm.nix	ncurses: split into multiple outputs	2015-10-13 20:18:44 +02:00
torbrowser.nix	torbrowser: 5.0.6 -> 5.0.7, add desktop file	2016-01-18 14:47:33 +01:00
torsocks.nix	nixpkgs: torsocks 2.0.0 -> 2.1.0	2015-07-20 21:50:29 -05:00