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

Trivial merge