who rescues tris from the tank full of water

As she's beginning to drown, someone comes in and breaks the glass with a bullet, and she realizes it's her mother, Natalie Prior.

Nobody does. She breaks the glass during the simulation. (If that's your question, if not... Jill's got it correct).