]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b6be02 ec7f99e)
Merge branch 'maint-0.4.1' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Thu, 30 Jan 2020 00:42:43 +0000 (19:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 30 Jan 2020 00:42:43 +0000 (19:42 -0500)
"Ours" merge to avoid version bump.


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