]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1855'
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 8 Apr 2020 13:31:37 +0000 (16:31 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 8 Apr 2020 13:31:37 +0000 (16:31 +0300)

Trivial merge