]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca24913 2984fba)
Merge branch 'maint-0.3.5' into maint-0.4.5
authorNick Mathewson <nickm@torproject.org>
Mon, 16 Aug 2021 12:18:09 +0000 (08:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 Aug 2021 12:18:09 +0000 (08:18 -0400)
"ours" to avoid version bump


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