Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity

into  psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity

bk: 55ad0fb93qdBRoStr7C2ZYciVNOzQQ

diff --cc ChangeLog
index c05260ba829c2e9ab60920fa6ba77b4fcbfc2b15,080fb77023bd62ed8767361db6f340b0a08b6d72..3458205bcc2eb09c008c713787b3431a35d42826
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -77,7 -81,12 +81,13 @@@ fixed formatting. Tomasz Flendric
  * Don't build sntp/libevent/sample/.  Harlan Stenn.
  * tests/libntp/test_caltontp needs -lpthread.  Harlan Stenn.
  * br-flock: --enable-local-libevent.  Harlan Stenn.
 +* Wrote tests for ntpd/ntp_prio_q.c. Tomasz Flendrich
+ * scripts/lib/NTP/Util.pm: stratum output is version-dependent.  Harlan Stenn.
+ * Get rid of the NTP_ prefix on our assertion macros.  Harlan Stenn.
+ * Code cleanup.  Harlan Stenn.
+ * libntp/icom.c: Typo fix.  Harlan Stenn.
+ * util/ntptime.c: initialization nit.  Harlan Stenn.
+ * ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr).  Harlan Stenn.
  ---
  (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>