A person involved in armed conflict against an occupation, or oppressive government, etc.; a revolutionary, an insurgent, a rebel or insurrectionist.
A Muslim engaging in jihad, especially armed jihad; a jihadist.