Both. You need a pump to get the tire started so you can check for a pinched tube. Carry co2 in case pump breaks or I am too tired, multiple flats, etc. I use a full size Blackburn frame pump.

I have one of these ordered.
http://www.velo-orange.com/quickerpropump.html