I think you should do whatever makes you more comfortable. Personally, I find that telling people upfront about my stutter tends to be more awkward than if they just find out when I naturally stutter. I'm not as ashamed of my stutter as I used to be, and I think people see that so they aren't as uncomfortable when I stutter around them.