]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1868/head'
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Apr 2020 12:32:44 +0000 (08:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Apr 2020 12:32:44 +0000 (08:32 -0400)

Trivial merge