]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/446'
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Oct 2018 18:49:15 +0000 (14:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Oct 2018 18:49:15 +0000 (14:49 -0400)

Trivial merge