]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6338c35 665083b)
Merge branch 'maint-0.3.5' into maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 22:13:25 +0000 (17:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 22:13:25 +0000 (17:13 -0500)
"-s ours" to avoid version bump.


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