]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1307'
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 11 Sep 2019 13:19:21 +0000 (16:19 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 11 Sep 2019 13:19:21 +0000 (16:19 +0300)

Trivial merge