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


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