Aligning anti-terrorism laws with criminal law and human rights