]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.2'
authorteor <teor@torproject.org>
Wed, 29 Jan 2020 21:55:20 +0000 (07:55 +1000)
committerteor <teor@torproject.org>
Wed, 29 Jan 2020 21:55:20 +0000 (07:55 +1000)

Trivial merge