]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.3'
authorNick Mathewson <nickm@torproject.org>
Tue, 10 Mar 2020 14:28:30 +0000 (10:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 10 Mar 2020 14:29:14 +0000 (10:29 -0400)
"ours" to avoid version bump.


Trivial merge