Merge branch 'tor-github/pr/1778'

This commit is contained in:
George Kadianakis 2020-03-19 17:16:00 +02:00
commit dccac40e69