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

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15-sec

bk: 5eb0e390Mm3gIuT5WJz36m8kU91Msw

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index c678fbc13fa232afb2c8a146d8eb3732381d31ab,2106bb3905a8fbc193ea593ad3a59d450ac947d3..4215ce0a4260c9cc05128c3fee45880f834b71cf
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -10,9 -10,8 +10,9 @@@ authentication between ntpd from versio
  4.2.8p14/4.3.100 will leak a small amount of memory for each packet.
  Eventually, ntpd will run out of memory and abort.
  
- It also fixes 7 other bugs.
+ It also fixes 8 other bugs.
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
  * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
  * [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
  * [Bug 3659] Move definition of psl[] from ntp_config.h to