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

Trivial merge