Merge pull request #4130
1c750db remove -tor compatibility code (only allow -onion) (Philip Kaufmann)