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

Trivial merge