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

Trivial merge