]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1098'
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 11 Jun 2019 10:19:43 +0000 (13:19 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 11 Jun 2019 10:19:43 +0000 (13:19 +0300)

Trivial merge