Merge "attacker_general: fix logging to use %s"