]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1851'
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 1 Apr 2020 23:38:11 +0000 (02:38 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 1 Apr 2020 23:38:11 +0000 (02:38 +0300)

Trivial merge