]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1233'
authorGeorge Kadianakis <desnacked@riseup.net>
Mon, 19 Aug 2019 15:05:22 +0000 (18:05 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Mon, 19 Aug 2019 15:05:22 +0000 (18:05 +0300)

Trivial merge