took out encryption because its not working at the moment
Merge branch 'master' of https://github.com/tchwella/dist-tor