]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1885/head'
authorNick Mathewson <nickm@torproject.org>
Tue, 12 May 2020 16:52:41 +0000 (12:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 May 2020 16:52:41 +0000 (12:52 -0400)

Trivial merge