[tor-commits] [tor/master] Making it slightly cleaner.