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