]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1860/head'
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Apr 2020 15:52:00 +0000 (11:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 14 Apr 2020 15:52:00 +0000 (11:52 -0400)

Trivial merge