From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 14 May 2020 10:55:02 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a5fe6a7fd8e306b1ce1fcb65652044f9b0badc9;p=thirdparty%2Fntp.git

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
---

6a5fe6a7fd8e306b1ce1fcb65652044f9b0badc9
diff --cc NEWS
index 15b36a35d,5f38d92e5..6a2b65088
--- a/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>