]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5
authorteor <teor@torproject.org>
Fri, 9 Aug 2019 04:01:50 +0000 (14:01 +1000)
committerteor <teor@torproject.org>
Fri, 9 Aug 2019 04:01:50 +0000 (14:01 +1000)

Trivial merge