]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1657'
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Jan 2020 18:10:14 +0000 (13:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Jan 2020 18:10:14 +0000 (13:10 -0500)

Trivial merge