Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/stdenv/generic/default.nix

pkgs/tools/security/tor/torsocks.nix

@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://code.google.com/p/torsocks/;
     repositories.git = https://git.torproject.org/torsocks.git;
     license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.phreedom ];
   };
 }

pkgs/tools/security/volatility/default.nix

@@ -17,6 +17,6 @@ buildPythonPackage rec {
     homepage = https://code.google.com/p/volatility;
     description = "advanced memory forensics framework";
     maintainers = with maintainers; [ bosu ];
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }