]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5
authorteor <teor@torproject.org>
Fri, 30 Aug 2019 13:20:59 +0000 (23:20 +1000)
committerteor <teor@torproject.org>
Fri, 30 Aug 2019 13:20:59 +0000 (23:20 +1000)

Trivial merge