[tor-commits] [stem/master] Fixing issues spotted by Ravi