I am going from the USA to Hong Kong, and have a 2 hour layover in Shanghai.

Do I need to get the Transit Visa before I depart the USA? I will also have a 2 hour layover in the city on my return flight from HK to the USA, one week later. If I need the Transit Visa, where do I get it?