]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
authorteor <teor@torproject.org>
Wed, 29 Jan 2020 21:53:53 +0000 (07:53 +1000)
committerteor <teor@torproject.org>
Wed, 29 Jan 2020 21:53:53 +0000 (07:53 +1000)

Trivial merge