[tor-commits] [tech-reports/master] Tweak Kevin's suggestions, comment out some of them.