Merge ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable-p16

into  ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable-p16-sec

bk: 64574fa6FRNhs00FDcG7V_zxfHrGWA

diff --cc ChangeLog
index cfd187332565844b97e67c064287a04975904b8a,3ea4f22d3ccc1d1cae5a7775cb98cae2fbcc63f2..667c836ec57232aefed7401472ed56b0e7ce6cbe
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -84,11 -77,8 +84,13 @@@
               Integrated patch from Brian Utterback. <hart@ntp.org>
  * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
  * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
 +* Use correct rounding in mstolfp(). perlinger/hart
 +* M_ADDF should use u_int32.  <hart@ntp.org>
 +* Only define tv_fmt_libbuf() if we will use it. <stenn@ntp.org>
 +* Use recv_buffer instead of the longer recv_space.X_recv_buffer. hart/stenn
 +* Disable "embedded NUL in string" warnings in libopts, when we can. <stenn@>
+ * If DEBUG is enabled, the startup banner now says that debug assertions
+   are in force and that ntpd will abort if any are violated. <stenn@ntp.org>
  * syslog valid incoming KoDs.  <stenn@ntp.org>
  * Rename a poorly-named variable.  <stenn@ntp.org>
  * Disable "embedded NUL in string" messages in libopts, when we can. <stenn@>