[tor-dev] Merging Tor Bug #27490