]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cd1c07 28ac17f)
Merge branch 'maint-0.4.2' into maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Wed, 6 May 2020 20:54:12 +0000 (16:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 6 May 2020 20:54:12 +0000 (16:54 -0400)
This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078
fix.


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