]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1382'
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Oct 2019 13:08:23 +0000 (09:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Oct 2019 13:08:23 +0000 (09:08 -0400)

Trivial merge