]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Feb 2020 18:48:39 +0000 (13:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Feb 2020 18:48:39 +0000 (13:48 -0500)

Trivial merge