]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/406'
authorNick Mathewson <nickm@torproject.org>
Wed, 17 Oct 2018 01:33:38 +0000 (21:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 17 Oct 2018 01:33:38 +0000 (21:33 -0400)

Trivial merge