]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1656'
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 14 Jan 2020 10:21:29 +0000 (12:21 +0200)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 14 Jan 2020 10:21:29 +0000 (12:21 +0200)

Trivial merge