Transition of the boundary layer on a circular cylinder in the presence of a trip