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: 263a69648d6c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c17479e7568
Choose a head ref
  • 4 commits
  • 1 file changed
  • 3 contributors

Commits on Nov 20, 2020

  1. tor: 0.4.3.6 -> 0.4.4.5 

    (cherry picked from commit c1ed88e)
    @prusnak
    prusnak committed Nov 20, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    584cc91 View commit details

  2. tor: remove myself as maintainer 

    (cherry picked from commit b1c4352)
    @doublec @prusnak
    doublec authored and prusnak committed Nov 20, 2020
    Copy the full SHA
    0aba51e View commit details

  3. tor: 0.4.4.5 -> 0.4.4.6 

    (cherry picked from commit 4c0678c)
    @prusnak
    prusnak committed Nov 20, 2020
    Copy the full SHA
    a6883b4 View commit details

  4. Merge pull request #104365 from prusnak/tor-20.09 

    [20.09] tor: 0.4.3.6 -> 0.4.4.6
    @mweinelt
    mweinelt authored Nov 20, 2020
    Copy the full SHA
    7c17479 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/tools/security/tor/default.nix
6 changes: 3 additions & 3 deletions pkgs/tools/security/tor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@

stdenv.mkDerivation rec {
pname = "tor";
version = "0.4.3.6";
version = "0.4.4.6";

src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
sha256 = "0qmcrkjip0ywq77232m73pjwqiaj0q2klwklqlpbw575shvhcbba";
sha256 = "1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az";
};

outputs = [ "out" "geoip" ];
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;

maintainers = with maintainers;
[ phreedom doublec thoughtpolice joachifm ];
[ phreedom thoughtpolice joachifm prusnak ];
platforms = platforms.unix;
};
}