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

Trivial merge