[tor-commits] [webwml/staging] Merge branch '24720'