[tor-commits] [tor/master] Rework 21359 changes file slightly.