]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ae9fd6 8749215)
Merge branch 'maint-0.3.5' into maint-0.4.4 maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Jun 2021 15:46:20 +0000 (11:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Jun 2021 15:46:20 +0000 (11:46 -0400)
"ours" to avoid version bump.


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