I'm so sorry that you're dealing with something that is making you uncomfortable. Personally, I don't think a therapist should EVER initiate a hug or ask for a hug. If it's a therapist who incorporates touch into his/her practice, that should be talked about in-depth before any touch is used. In the very beginning of my sessions with my former therapist, I was sitting in her waiting room when she exited her office with another client. The client stepped forward and held out her arms to my x-therapist and said, "Can I have a hug?" I cringed inwardly. I don't like to be hugged or touched. My x-therapist gave her hug and the woman went on her way. When I got into my session, my therapist immediately brought up the subject of touch and she spent a bit of time talking about what I thought about the hug I had witnessed--I told her it was fine with me . . . as long she wasn't hugging me!
She let me know that if that ever changed for me, that was okay AND if it never changed for me, that was okay too. She NEVER initiated a hug or touch the entire time I saw her, not even on the day I left and moved across the country. She really honored what I wanted and needed out of therapy. It was never about what she wanted or needed.

I also think it is very inappropriate for a therapist to ask a client if he/she can "massage" a client. It's entirely different if you went to a therapist who specializes in body work--that type of therapist spends a lot of time with his/her client assessing what the plan is in regard to body work. He/she wouldn't just out of the blue say, "Hey, do you mind if I give you a massage? You look a little tense."

I'm not saying your therapist is out to hurt you physically or emotionally, but I do think he has really really bad personal boundaries and that's not a good thing in a psychotherapist. If he's making you feel uncomfortable, I'd pay attention to that gut feeling and tell him that you're not comfortable with the hugs/massages and would prefer to just "talk". I know confrontation and setting down personal boundaries is hard but it's so important for those of us who are CSA in our past. No better place to practice those skills than in a therapy relationship. If he responds defensively or dismisses your discomfort as inappropriate or a result of your past, I'd take that as a pretty clear indication that he's not the right therapist for you and I'd run for the exit and find someone new. Good luck!