]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c90fc3 0ff3e8f)
Merge branch 'maint-0.4.1' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Feb 2020 13:53:00 +0000 (08:53 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Feb 2020 13:53:00 +0000 (08:53 -0500)
"ours" merge, since the exceptions.txt file is already fixed in this branch.


Trivial merge
Mirror of https://git.torproject.org/tor.git