Work in Progress Tor Integration
Merge conflicts
Adding a warning when leaving the Tor universe
Completes #354
Fixing submodule dependency, bringing back to original repo
Merge pull request #477 from FredericJacobs/master

Long overdue Tor Integration for Mac (issue #354)