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