Merge
Merge branch 'master' of github.com:tchwella/dist-tor
Fix conflict