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

Commits on Nov 17, 2020

  1. tor: 0.4.4.5 -> 0.4.4.6

    @prusnak
    prusnak committed Nov 17, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c0678c View commit details

Commits on Nov 20, 2020

  1. Merge pull request #104076 from prusnak/tor 

    tor: 0.4.4.5 -> 0.4.4.6
    @mweinelt
    mweinelt authored Nov 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    661981e 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.4.5";
version = "0.4.4.6";

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

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

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