]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.9' into release-0.2.9 release-0.2.9
authorteor <teor@torproject.org>
Fri, 20 Dec 2019 00:12:30 +0000 (10:12 +1000)
committerteor <teor@torproject.org>
Fri, 20 Dec 2019 00:12:30 +0000 (10:12 +1000)

Trivial merge