]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/402'
authorNick Mathewson <nickm@torproject.org>
Sun, 14 Oct 2018 19:20:39 +0000 (15:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 14 Oct 2018 19:20:39 +0000 (15:20 -0400)

Trivial merge