]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.3'
authorNick Mathewson <nickm@torproject.org>
Thu, 9 Apr 2020 12:38:59 +0000 (08:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 9 Apr 2020 12:38:59 +0000 (08:38 -0400)
"ours" to avoid version bump


Trivial merge