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

diff --cc ChangeLog
index 0cc45640e30aed03aa474f64d95166d01d6fe5a7,4568be3eede662732627a3bda6a70452ab234845..1523982e9730acc76133e723cb9994b4d75adbaf
--- 1/ChangeLog
--- 2/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.
  
  ---