Comment the rewriting architecture
Merge branch 'master' of https://git.torproject.org/https-everywhere