]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c1a49c 7a9e2a2)
Merge branch 'maint-0.4.1' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Fri, 13 Mar 2020 20:57:03 +0000 (16:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 13 Mar 2020 20:57:03 +0000 (16:57 -0400)
"ours" to avoid version bump.


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