]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1704'
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 4 Feb 2020 12:09:41 +0000 (13:09 +0100)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 4 Feb 2020 12:09:41 +0000 (13:09 +0100)

Trivial merge