]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Fri, 13 Mar 2020 20:46:09 +0000 (16:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 13 Mar 2020 20:46:09 +0000 (16:46 -0400)

Trivial merge