[tor-commits] [webwml/staging] Merge branch 'master' into staging