[tor-commits] [tpo/master] Fix content hierarchy