]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1774/head'
authorNick Mathewson <nickm@torproject.org>
Thu, 5 Mar 2020 14:10:24 +0000 (09:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 Mar 2020 14:10:24 +0000 (09:10 -0500)

Trivial merge