]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3248630 7174a80)
Merge branch 'maint-0.4.1' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Dec 2019 21:03:01 +0000 (16:03 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Dec 2019 21:03:01 +0000 (16:03 -0500)
"ours" to avoid version bump.


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