]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1785' into maint-0.3.5
authorAlexander Færøy <ahf@torproject.org>
Tue, 30 Jun 2020 13:47:55 +0000 (13:47 +0000)
committerAlexander Færøy <ahf@torproject.org>
Tue, 30 Jun 2020 13:47:55 +0000 (13:47 +0000)

Trivial merge