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

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

bk: 5ac9bfb5zGu3t4_dlp4hOb5CIMKRag

diff --cc ChangeLog
index ef21e3e9dce0db7f441393e6019dc85e8c7cb4af,ffc3357a0cacb0e5e7f6bc6dcbdd718acda83781..60d0d05a27d7763328b0cce2ac28e8c3f4d8dae4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,9 +1,10 @@@
  ---
+ 
 +* [Bug 3465] Default TTL values cannot be used <perlinger@ntp.org>
+ * [Bug 3456] Use uintptr_t rather than size_t to store an integer in a pointer
+  - According to Brooks Davis, there was only one location <perlinger@ntp.org>
+ * [Bug 2821] minor build issues <perlinger@ntp.org>
+  - applied patches by Christos Zoulas, including real bug fixes
  
  ---
  (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_config.c
Simple merge