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