From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 12 Oct 2017 07:49:11 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-948
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7c1b8d7d8e8a810e78d0523d85047ca944a8973;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-948
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-2557

bk: 59df1e77CMpIVIGLkssyBDSE1In6nw
---

d7c1b8d7d8e8a810e78d0523d85047ca944a8973
diff --cc ChangeLog
index 0cc45640e,4568be3ee..1523982e9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,8 @@@
  ---
  
  * [Bug 3358] Spurious KoD log messages in .INIT. phase.  HStenn.
+ * [Bug 2557] Fix Thunderbolt init. ntp-bugs@bodosom.net, perlinger@ntp.
 +* [Bug 948] Trustedkey config directive leaks memory. <perlinger@ntp.org>
  * Use strlcpy() to copy strings, not memcpy().  HStenn.
  
  ---