[tor-commits] [webwml/master] Make staging branch match master state