After a Massacre, Ethiopia’s Leader Faces Anger, and a Challenger