In socialist Poland both were used, but "comrade" (Towarzysz/Towarzyszka) was the honorific for member of the party while "citizen" (Obywatel/Obywatelka) was used for everyone else in official situations. Most people still used the "Pan/Pani" (Mr/Mrs) though, which was a bit reactionary because in Polish language this word does not even come from the bourgeoise honorific "Master" but from the aristocratic "Lord".