]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1234'
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 27 Aug 2019 08:44:13 +0000 (11:44 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 27 Aug 2019 08:44:13 +0000 (11:44 +0300)

Trivial merge