]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Oct 2018 21:12:11 +0000 (17:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Oct 2018 21:12:11 +0000 (17:12 -0400)

Trivial merge