]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 494ced6 fd22fa1)
Merge branch 'maint-0.4.3' into maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Thu, 12 Nov 2020 13:12:20 +0000 (08:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 Nov 2020 13:12:20 +0000 (08:12 -0500)
"ours" to avoid version bump.


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