dbug
Merge branch 'encrypt' of github.com:tchwella/dist-tor into encrypt