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: 5ed37dddn6AtWg-0Dc0aR5IlFO2TuA

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index e280a66e7d7f5981186ac1befc8ae427f885aba6,fa0454953c75b73e706d2ced518941594bed7178..e846d68a768920be58ec13f9283adbba7f428bcf
--- 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 11 other bugs.
+ It also fixes 12 other bugs.
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
  * [Bug 3667] decodenetnum fails with numeric port <perlinger@ntp.org>
    - rewrite 'decodenetnum()' in terms of inet_pton
  * [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>