]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/925'
authorGeorge Kadianakis <desnacked@riseup.net>
Thu, 18 Apr 2019 10:22:54 +0000 (13:22 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Thu, 18 Apr 2019 10:22:54 +0000 (13:22 +0300)

Trivial merge