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

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

bk: 645b6a4cMNdWoeE1Ne4Ur6j0MKJDoA

diff --cc ChangeLog
index d58088e178c75e93f88c6ade4045dc945932dfaa,410fc228e428a797a6d9ba4c8fcce3b8ce61871f..b151d28a21a6861e9468639b01055af6063c29dc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,5 +1,12 @@@
  ---
 +* [Sec 3808] Assertion failure in ntpq on malformed RT-11 date <perlinger@ntp.org>
 +* [Sec 3807] praecis_parse() in the Palisade refclock driver has a
 +             hypothetical input buffer overflow. Reported by ... stenn@
 +* [Sec 3806] libntp/mstolfp.c needs bounds checking <perlinger@ntp.org>
 +  - solved numerically instead of using string manipulation
 +* [Sec 3767] An OOB KoD RATE value triggers an assertion when debug is enabled.
 +             <stenn@ntp.org>
+ * [Bug 3817] Bounds-check "tos floor" configuration. <hart@ntp.org>
  * [Bug 3814] First poll delay of new or cleared associations miscalculated.
               <hart@ntp.org>
  * [Bug 3802] ntp-keygen -I default identity modulus bits too small for

diff --cc ntpd/ntp_config.c
Simple merge