]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/689' into maint-0.3.5
authorGeorge Kadianakis <desnacked@riseup.net>
Thu, 14 Feb 2019 16:00:05 +0000 (18:00 +0200)
committerGeorge Kadianakis <desnacked@riseup.net>
Thu, 14 Feb 2019 16:00:05 +0000 (18:00 +0200)

Trivial merge