Git Rebase Question

I decide to work on a new feature, so I create a branch, topic.

o---o master
     \
      o---o---o---o topic


I am not yet finished working on my feature when I have to make some bugfixes to master

o---o---o---o master
     \
      o---o---o---o topic


To help me continue working on topic, I would like the bugfixes to be included in the topic branch.
Do I?

Merge master into topic           (or)     Rebase topic onto master
                                    
o---o-----------o---o master               o---o---o---o master
     \               \                                  \
      o---o---o---o---o topic                            o---o---o---o---o topic

What do you think?

yeah, basically, if you've pushed that branch and others may have pulled it, don't rebase, otherwise (usually locally), you're fine