[tor-commits] [tor/master] Split container.c based on container types, and minimize includes