Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2085-86-87

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2085-86-87

bk: 4edfef62uEwf86myPvAhhTg06xAlUA

diff --cc ChangeLog
Simple merge

diff --cc libntp/systime.c
Simple merge

diff --cc ntpd/ntp_proto.c
index 622f11bf9e3e3836006c809a3eb803b70f549f4e,03e3593b9435e037c856cb230e99350f289a4789..9b82e084e4a04b2e604d35a3362e235e94092600
--- 1/ntpd/ntp_proto.c
--- 2/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@@ -1811,12 -1667,10 +1811,13 @@@ clock_update
                sys_refid = peer->refid;
        else
                sys_refid = addr2refid(&peer->srcadr);
 -      dtemp = sys_jitter + fabs(sys_offset) + peer->disp +
 +      dtemp = fabs(sys_offset) + peer->disp + peer->rootdisp +
-           clock_phi * (current_time - peer->update) + sys_jitter;
+           (peer->delay + peer->rootdelay) / 2 + clock_phi *
 -          (current_time - peer->update);
 -      sys_rootdisp = dtemp + peer->rootdisp;
++          (current_time - peer->update) + sys_jitter;
 +      if (dtemp > sys_mindisp)
 +              sys_rootdisp = dtemp;
 +      else
 +              sys_rootdisp = sys_mindisp;
        sys_rootdelay = peer->delay + peer->rootdelay;
        sys_reftime = peer->dst;
  
@@@ -2838,9 -2698,9 +2839,9 @@@ clock_select(void
        if (typesystem != NULL) {
                if (sys_prefer == NULL) {
                        typesystem->new_status = CTL_PST_SEL_SYSPEER;
 -                      clock_combine(peer_list, sys_survivors);
 +                      clock_combine(peers, sys_survivors);
-                       sys_jitter = SQRT(SQUARE(typesystem->jitter) +
-                           SQUARE(sys_jitter) + SQUARE(seljitter));
+                       sys_jitter = SQRT(SQUARE(sys_jitter) +
+                           SQUARE(seljitter));
                } else {
                        typesystem = sys_prefer;
                        sys_clockhop = 0;