]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:14:46 +0000 (08:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:14:46 +0000 (08:14 -0400)

Trivial merge