[tor-commits] [tor/master] Fold in the entry for 28089