]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1756/head'
authorNick Mathewson <nickm@torproject.org>
Wed, 19 Feb 2020 16:57:27 +0000 (11:57 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 19 Feb 2020 16:57:27 +0000 (11:57 -0500)

Trivial merge