]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1864/head'
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Apr 2020 23:16:40 +0000 (19:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Apr 2020 23:16:40 +0000 (19:16 -0400)

Trivial merge