]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1899/head'
authorNick Mathewson <nickm@torproject.org>
Thu, 21 May 2020 14:08:48 +0000 (10:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 May 2020 14:08:48 +0000 (10:08 -0400)

Trivial merge