error handling
Merge branch 'encrypt' of https://github.com/tchwella/dist-tor into encrypt