A) water and a cup.
He is saying that they have a thirst for freedom and justice, but that they have to be careful to not mistake that "water" (justice) for anything in the cup to drink, which might be "bitterness and hatred", just because they are so thirsty for the justice.