]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ba8493 49b4d17)
Merge branch 'maint-0.4.2' into maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Thu, 9 Jul 2020 17:14:58 +0000 (13:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 9 Jul 2020 17:14:58 +0000 (13:14 -0400)
`-s ours` to avoid version bump.


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