]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/404'
authorNick Mathewson <nickm@torproject.org>
Tue, 16 Oct 2018 21:29:50 +0000 (17:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 16 Oct 2018 21:29:50 +0000 (17:29 -0400)

Trivial merge