]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Mar 2019 13:45:31 +0000 (09:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Mar 2019 13:45:31 +0000 (09:45 -0400)

Trivial merge