]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/859'
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 27 Mar 2019 12:30:53 +0000 (14:30 +0200)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 27 Mar 2019 12:30:53 +0000 (14:30 +0200)

Trivial merge