]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 283ce30 0bb227d)
Merge branch 'maint-0.3.5' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Thu, 9 Jul 2020 14:30:03 +0000 (10:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 9 Jul 2020 14:30:03 +0000 (10:30 -0400)
`-s ours` to avoid version bump.


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