Aurangzeb, in his attempt to annex Marwar to the Mughal empire, was involved in a 30-year war. During these long years, the most valiant struggle from the aid of Marwar was fought by