Merge pull request #65 from yaronyg/master

Integrated TOR!!!!!!!
Merge pull request #66 from yaronyg/master

Insecure change to only route onion addresses over Tor
Merge remote-tracking branch 'upstream/master'
Accidentally turned off the Tor Onion Proxy Tests for android