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

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 570caf6aKH9dd37W08uGDyG-bD0Wzw

diff --cc ChangeLog
index 5165c17abe30f2b0a391087ec8de779c86d3823d,a99c3a9feb514a013f3fbcb4484de5f74c8295b9..69b7ce6aec174532210a2e9232c66f7205bda43a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -38,9 -22,12 +40,14 @@@
    - reduced number of error branches (authreadkeys.c)
  * [Bug 3023] ntpdate cannot correct dates in the future. perlinger@ntp.org
  * [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
+ * [Bug 3031] ntp broadcastclient unable to synchronize to an server
+              when the time of server changed. perlinger@ntp.org
+   - Check the initial delay calculation and reject/unpeer the broadcast
+     server if the delay exceeds 50ms. Retry again after the next
+     broadcast packet.
  * Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Update html/xleave.html documentation.  Harlan Stenn.
 +* Update ntp.conf documentation.  Harlan Stenn.
  * Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
  * Fix typo in html/monopt.html.  Harlan Stenn.
  * Add README.pullrequests.  Harlan Stenn.

diff --cc include/ntp.h
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge

diff --cc ports/winnt/vs2013/libntp/libntp.vcxproj.filters
Simple merge