]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'pr1590_amended_commit'
authorteor <teor@torproject.org>
Mon, 16 Dec 2019 23:49:30 +0000 (09:49 +1000)
committerteor <teor@torproject.org>
Mon, 16 Dec 2019 23:49:30 +0000 (09:49 +1000)

Trivial merge