[tor-commits] [tor/master] Changes for 27246