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

Trivial merge