]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1401'
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2019 20:29:46 +0000 (16:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2019 20:29:46 +0000 (16:29 -0400)

Trivial merge