Encode URIs properly
Merge branch 'master' of github.com:davidbanham/ntor