]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1711'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Feb 2020 15:23:50 +0000 (10:23 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Feb 2020 15:23:50 +0000 (10:23 -0500)

Trivial merge