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

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

bk: 5ac9c4f8nbXyOoOoG2HBm95hC7eljw

diff --cc ChangeLog
index 60d0d05a27d7763328b0cce2ac28e8c3f4d8dae4,02ecbc4ad31249cf4b5e7e4047a5be2340299816..df8ee65fec6a0818a6c7795182de17a8946e3a75
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,11 @@@
  ---
 +
+ * [Bug 3470] ntpd4.2.8p11 fails to compile without OpenSSL <perlinger@ntp.org>
 +* [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>