]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'pr-1569-squashed'
authorteor <teor@torproject.org>
Tue, 3 Dec 2019 02:57:06 +0000 (12:57 +1000)
committerteor <teor@torproject.org>
Tue, 3 Dec 2019 02:57:06 +0000 (12:57 +1000)

Trivial merge