]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/421'
authorNick Mathewson <nickm@torproject.org>
Mon, 22 Oct 2018 12:49:55 +0000 (08:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 22 Oct 2018 12:49:55 +0000 (08:49 -0400)

Trivial merge