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: 5ebd2386KDWDx2CqYVk3Kt9ItgupTA

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 15b36a35df3d8c3028876e55f736b7bc2272765e,5f38d92e5ec54d03f9c1c97d5c129661af939963..6a2b65088c0d893a0cfe17b4ebba9edb827b8ae3
--- 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 9 other bugs.
+ It also fixes 10 other bugs.
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
  * [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
    - limit number of receive buffers, with an iron reserve for refclocks
  * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>