]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
authorteor <teor@torproject.org>
Thu, 8 Aug 2019 01:07:34 +0000 (11:07 +1000)
committerteor <teor@torproject.org>
Thu, 8 Aug 2019 01:07:34 +0000 (11:07 +1000)

Trivial merge