[tor-commits] [tor/master] Trivial bugfixes found during TROVE investigation.