[tor-commits] [tor/master] Improve bug25398 changes again.