Merge psp-deb1.ntp.org:/home/mayer/ntp-stable-Bug2995/

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 56a38df9HhObuKRZDWd5Dv_4WNG9gw

diff --cc ChangeLog
index 0f867209e859b1e34679b13634dff172ba0631a9,83a50d044292689e6d21c01f50505c3d576edbd6..1eedefe89ee2d24dccfb5e71b2604bc6252bd764
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,13 +1,14 @@@
+ ---
+ 
+ * [Sec 2901] KoD packets must have non-zero transmit timestamps.  HStenn.
+ * [Sec 2936] Skeleton Key: Any system knowing the trusted key can serve
+   time. Include passive servers in this check. HStenn.
+ * [Sec 2945] Additional KoD packet checks.  HStenn.
+ * [Bug 2879] Improve NTP security against timing attacks. perlinger@ntp.org
+   - integrated patches by Loganaden Velvidron <logan@ntp.org>
+     with some modifications & unit tests
 +* [Bug 2995] Fixes to compile on Windows
+ 
  ---
  (4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc ports/winnt/vs2008/libntp/libntp.vcproj
Simple merge

diff --cc ports/winnt/vs2013/libntp/libntp.vcxproj
Simple merge