[tor-commits] [tpo/staging] Merge branch '404-template' into staging