[tor-commits] [tor/master] Forward-port fix for 7889