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

Trivial merge