]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:21:51 +0000 (11:21 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:21:51 +0000 (11:21 -0500)

Trivial merge