Various comment fixes
Please review and merge:
https://github.com/torproject/tor/pull/535