summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-03-24 19:19:30 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-03-24 19:19:30 -0700
commit740089d2e36911b503a1c6b664d4c9a3bfa1cf00 (patch)
treef8800f612f280b242481d46d56d4b0f06a14e85a /pkgs/tools
parent6e3c9d5ce46990618f36f0e98934ed1cfaf20535 (diff)
parent9369daf1343d499242d120f89901db78ce007a5e (diff)
downloadnixlib-740089d2e36911b503a1c6b664d4c9a3bfa1cf00.tar
nixlib-740089d2e36911b503a1c6b664d4c9a3bfa1cf00.tar.gz
nixlib-740089d2e36911b503a1c6b664d4c9a3bfa1cf00.tar.bz2
nixlib-740089d2e36911b503a1c6b664d4c9a3bfa1cf00.tar.lz
nixlib-740089d2e36911b503a1c6b664d4c9a3bfa1cf00.tar.xz
nixlib-740089d2e36911b503a1c6b664d4c9a3bfa1cf00.tar.zst
nixlib-740089d2e36911b503a1c6b664d4c9a3bfa1cf00.zip
Merge pull request #6972 from doublec/tor
Update Tor and Tor Browser
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/security/tor/default.nix4
-rw-r--r--pkgs/tools/security/tor/torbrowser.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 54a76280a1cc..db3fe3197fa5 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl, zlib, torsocks }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.5.10";
+  name = "tor-0.2.5.11";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "0fx8qnwh2f8ykfx0np4hyznjfi4xfy96z59pk96y3zyjvjjh5pdk";
+    sha256 = "0sb7ai8r9c0nvdagjrbfqpri6x4njfxv954fxrjv46rzkkpgmq5f";
   };
 
   # Note: torsocks is specified as a dependency, as the distributed
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 750ab3708729..3e6e50281118 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.0.4";
+  version = "4.0.5";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82" else
-      "f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185";
+      "0w1vq2fvk0ik503vz02znk80ywpnsybx0sc6906q7sbk3i7ggxp1" else
+      "1yljz43kyl6pmri1xnxmfxh6nphczvwgbrdgdsimc05zsfbrh363";
   };
 
   patchPhase = ''