]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
authorteor <teor@torproject.org>
Wed, 27 Mar 2019 02:31:07 +0000 (12:31 +1000)
committerteor <teor@torproject.org>
Wed, 27 Mar 2019 02:31:07 +0000 (12:31 +1000)

Trivial merge