]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85cfd04 c0dd2a6)
Merge branch 'maint-0.4.3'
authorNick Mathewson <nickm@torproject.org>
Fri, 15 May 2020 13:02:30 +0000 (09:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 May 2020 13:02:30 +0000 (09:02 -0400)
"ours" to avoid version bump


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