Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-aes128cmac-jp

bk: 5a2e44277hk9H8M9JH7B_VZ_lRFQRw

diff --cc ChangeLog
index 2d5086737a52ed10a3106735271d2faa3977842a,9bfe76719a28f08fd7982e0709303ac3727aae20..dca3d0013a462de4e04e41b9e123ec0c15906e68
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -51,7 -49,7 +52,8 @@@
  * refclock_jjy.c: Add missing "%s" to an msyslog() call.  HStenn.
  * Build ntpq and libntpq.a with NTP_HARD_*FLAGS.  perlinger@ntp.org
  * Fix bug in the override portion of the compiler hardening macro. HStenn.
+ * record_raw_stats(): Log entire packet.  Log writes.  HStenn.
 +* AES-128-CMAC support.  BInglis, HStenn, JPerlinger.
  
  ---
  (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>

diff --cc sntp/crypto.c
Simple merge