[tor-commits] [tor/master] Changes suggested by teor.