]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfa9cc3 e66533b)
Merge branch 'maint-0.4.0' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Thu, 5 Dec 2019 18:31:17 +0000 (13:31 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 Dec 2019 18:31:17 +0000 (13:31 -0500)
"ours" to avoid version bump.


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