]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/985'
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 30 Apr 2019 16:25:32 +0000 (19:25 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 30 Apr 2019 16:25:32 +0000 (19:25 +0300)

Trivial merge