sync cvs as of 2012-12-14 (keep cipher-ctr.c)
sync cvs as of 2012-12-14 (cipher-ctr.c removal)