Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3144

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

bk: 5871e155lXpCd3AyznMDFqqIwMh43w

diff --cc ChangeLog
index 62b527bb6dd969a1fa03dd1e8abb3d04059df39d,29e7524b399d1666c34c33201fdbc542f142643b..cc2b5848b5a9f9694dce48e7e3165b017ca36d98
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,11 +1,12 @@@
  ---
+ 
 +* [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
+ * [Bug 2923] Trap Configuration Fail <perlinger@ntp.org>
+   - fixed dependency inversion from [Bug 2837]
+ * [Bug 2645] out-of-bound pointers in ctl_putsys and decode_bitflags
+   - Fixed these and some more locations of this pattern.
+     Probably din't get them all, though. <perlinger@ntp.org>
+ * Update copyright year.
  
  ---
  (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge