Maximal tori in finite groups of Lie type