Its a bit of a minefield isn't it.
Trustfire 2300 mAh LiIon cells regardless of being labeled 2500 mAh are OK, I have used them for about 5 years and have only changed over to genuine Sanyo because the capacity isn't up to what its supposed to be, the Chinese in describing them as "2300 mAh" are being honest, but they are good cells. Even Torchy states this on his website.
But avoid Ultrafire like the plague.
A dedicated LiIon charger, assuming it does what it says on the tin, will not overcharge the cells, so with a decent charger cell protection is not needed.
Overdischarge is a different game and the possibility of this happening depends on the design of the torch. Parallel cells will output up to 4.2V fresh off charge, with the max dischage safe level of about 2.6V. If the torches electronics are such that it utilises parallel cells and does not have a voltage booster the torch will be so dim long before its cells are down to a dangerous level; you will know about it. However, the internals of the torch are an unknown factor, so lets move on.
So bottom line on this is to use decent protected cells and buy a decent charger to go with them. If something offered under the Ultrafire brand label looks iffy, then take your own advice and buy something else.
My avatar is a poor likeness.