Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3f571a9410b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c14f02107653
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 4, 2017

  1. tor: 0.3.1.7 -> 0.3.1.8 

    Quoth the release notes:

> It includes several bugfixes, including a bugfix for a crash issue that
had affected relays under memory pressure. It also adds a new directory
authority, Bastet.

(cherry picked from commit 5a64e44)
    @joachifm
    joachifm committed Nov 4, 2017
    Copy the full SHA
    0a2e061 View commit details

  2. tor-browser-bundle-bin: 7.0.7 -> 7.0.8 

    (cherry picked from commit 2b496a8)
    @joachifm
    joachifm committed Nov 4, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48bc4ed View commit details

  3. tor-browser-bundle-bin: 7.0.8 -> 7.0.9 

    (cherry picked from commit 86bc99c)
    @joachifm
    joachifm committed Nov 4, 2017
    Copy the full SHA
    c14f021 View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  2. +2 −2 pkgs/tools/security/tor/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "7.0.7";
version = "7.0.9";

lang = "en-US";

@@ -107,15 +107,15 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "1848j28majbb61r080g6dw0lmh7hbp515iidyjdrpgcwhazzg06j";
sha256 = "0ykbpp0qr3glygmnnc6ac41kkvrxn52472z6kbpf7i6qzvk4ba0d";
};

"i686-linux" = fetchurl {
urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "08wvpymmyg16ifz23awnjy0pbva8xh1fdx2i8c1n18x3k12d5r7h";
sha256 = "02alpzmvm3ldlp51sqppz41d12lx93n5qj6i3gqz6din96swm7j8";
};
};
in
4 changes: 2 additions & 2 deletions pkgs/tools/security/tor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
}:

stdenv.mkDerivation rec {
name = "tor-0.3.1.7";
name = "tor-0.3.1.8";

src = fetchurl {
url = "https://dist.torproject.org/${name}.tar.gz";
sha256 = "13y0v4zfla0vziy9kkahmhrwylv32ianjikcr46mwbxvji4dvx8x";
sha256 = "18dinpj03d036rashlad16lv7j2hba8gg742z07l37x5c242kxkx";
};

outputs = [ "out" "geoip" ];