Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3016

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3016

bk: 59df292b5_5FWg87QlKgEVlKRnvCmQ

diff --cc ChangeLog
index 934277fca6cad10b344d96dcfb183855d2bc6581,32a8a67c7e4fd5680bf69af5d294db0b5b953a16..0360baa32d90748fece91574b1a58652615a825c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,10 +1,16 @@@
  ---
 +
 +* [Bug 3358] Spurious KoD log messages in .INIT. phase.  HStenn.
+ * [Bug 3016] wrong error position reported for bad ":config pool"
+   - fixed location counter & ntpq output <perlinger@ntp.org>
 +* [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>