Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p14-sec

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

bk: 5e4a587508r_CT4puRZgqNK-VLdrrQ

diff --cc ChangeLog
index 4b32408ee2bc324e79efb1cadcc3599001149a53,0a5ef15039ea3f4116c391c1f5159f863f1c4e96..d3a363f34ff74fcc9c27750fee56f898f70a078a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,6 -2,6 +2,8 @@@
  
  * [Sec 3610] process_control() should bail earlier on short packets. stenn@
    - Reported by Philippe Antoine
++* [Sec 3596] Highly predictable timestamp attack. <stenn@ntp.org>
++  - Reported by Miroslav Lichvar
  * [Bug 3637] Emit the version of ntpd in saveconfig.  stenn@
  * [Bug 3636] NMEA: combine time/date from multiple sentences <perlinger@ntp.org>
  * [Bug 3635] Make leapsecond file hash check optional <perlinger@ntp.org>
@@@ -84,8 -84,7 +86,9 @@@
  * [Bug 1433] runtime check whether the kernel really supports capabilities
    - (modified) patch by Kurt Roeckx <perlinger@ntp.org>
  * Clean up sntp/networking.c:sendpkt() error message.  <stenn@ntp.org>
 +* Provide more detail on unrecognized config file parser tokens. <stenn@ntp.org>
 +* Startup log improvements. <stenn@ntp.org>
+ * Update the copyright year.
  
  ---
  (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>