]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
authorteor <teor@torproject.org>
Wed, 12 Feb 2020 02:18:59 +0000 (12:18 +1000)
committerteor <teor@torproject.org>
Wed, 12 Feb 2020 02:18:59 +0000 (12:18 +1000)

Trivial merge