Merge pull request #3837 from hauke/tor