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

Trivial merge