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

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

bk: 59df20bayEufASd4yKUYua9rp6xLvA
---

84b802570e4aba9ede204c071bd5554a8870e3f8
diff --cc ChangeLog
index 1523982e9,7c1cd9073..934277fca
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,9 +1,14 @@@
  ---
 -* [Bug 2737] Wrong phone number listed for USNO <perlinger@ntp.org>
 +
 +* [Bug 3358] Spurious KoD log messages in .INIT. phase.  HStenn.
++* [Bug 2737] Wrong phone number listed for USNO. ntp-bugs@bodosom.net,
++  perlinger@ntp.org
 +* [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.
  
  ---
 -(4.2.8p10-win-beta1) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
 -(4.2.8p10)
 +(4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Sec 3389] NTP-01-016: Denial of Service via Malformed Config
    (Pentest report 01.2017) <perlinger@ntp.org>