]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5
authorteor <teor@torproject.org>
Wed, 6 Nov 2019 01:17:01 +0000 (11:17 +1000)
committerteor <teor@torproject.org>
Wed, 6 Nov 2019 01:17:01 +0000 (11:17 +1000)

Trivial merge