[tor-commits] [tor/master] manually forward-port 2871dd8bef