Merge bk://bk.ntp.org/ntp-stable

into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2845

bk: 557bfc4dxvtpgUZwohyDSyE9_AM0uQ

diff --cc ChangeLog
index cb287ffc52e68c863f814e90b05ccd86d2852e9a,eb8a2e8be48ba30d866b643ac8ec405b49a614f2..e982a5c00784a467c64bcfe35bbfa6230625adb3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -17,16 -17,8 +17,17 @@@
  * [Bug 2837] add test for DSCP to ntpd/complete.conf.in
  * [Bug 2842] Glitch in ntp.conf.def documentation stanza.
  * [Bug 2842] Bug in mdoc2man.
 +* [Bug 2843] make check fails on 4.3.36
 +   Fixed compiler warnings about numeric range overflow
 +   (The original topic was fixed in a byplay to bug#2830)
++* [Bug 2845] Harden memory allocation in ntpd.
  * Report select() debug messages at debug level 3 now.
  * sntp/scripts/genLocInfo: treat raspbian as debian.
 +* Unity test framework fixes.
 +  ** Requires ruby.
 +* Initial support for PACKAGE_VERSION tests.
 +* sntp/libpkgver belongs in EXTRA_DIST, not DIST_SUBDIRS.
 +* tests/bug-2803/Makefile.am must distribute bug-2803.h.
  ---
  (4.2.8p3-RC1) 2015/05/12 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc ntpq/ntpq-subs.c
Simple merge