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

into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2945

bk: 569613f6X2DDI5Xky4vjOHOue7jDFw

diff --cc ChangeLog
index 731fa701e7fa488175c86878b60d3466d2d083db,08030bbfe7bf4e2b5c136595fa6512f272014a11..c0aa1db4a2cfa7e34d70f30b18178d431dc75a32
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,6 +1,14 @@@
  ---
  
 +* [Sec 2935] Deja Vu: Replay attack on authenticated broadcast mode. HStenn.
 +* [Sec 2937] ntpq: nextvar() missing length check. perlinger@ntp.org
 +* [Sec 2938] ntpq saveconfig command allows dangerous characters
 +  in filenames. perlinger@ntp.org
 +* [Sec 2939] reslist NULL pointer dereference.  perlinger@ntp.org
 +* [Sec 2940] Stack exhaustion in recursive traversal of restriction
 +  list. perlinger@ntp.org
+ * [Sec 2945] Zero Origin Timestamp Bypass. perlinger@ntp.org
 +* Make leapsec_query debug messages less verbose.  Harlan Stenn.
  
  ---
  (4.2.8p5) 2016/01/07 Released by Harlan Stenn <stenn@ntp.org>
@@@ -66,9 -59,8 +67,8 @@@
  * Quiet a warning from clang.  Harlan Stenn.
  * Update the NEWS file.  Harlan Stenn.
  * Update scripts/calc_tickadj/Makefile.am.  Harlan Stenn.
 +
  ---
- (4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>
 -(4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Sec 2899] CVE-2014-9297  perlinger@ntp.org
  * [Sec 2901] Drop invalid packet before checking KoD. Check for all KoD's.

diff --cc ntpd/ntp_proto.c
Simple merge