Merge pogo.udel.edu:/pogo/users/kardel/ntp-dev

into  pogo.udel.edu:/pogo/users/mayer/ntp-dev-dyn

bk: 4308fa1bGbyNy5XpaFddRHvOJ-IC0Q

diff --cc include/ntp.h
index 04b0023ddb9661c6220a426837d6444d8e226d73,08f950f8b27f09b29846603bb4a1356528fe2e95..35989d516b8985924464d4577907f8680852a8ee
--- 1/include/ntp.h
--- 2/include/ntp.h
+++ b/include/ntp.h
@@@ -9,9 -9,9 +9,10 @@@
  #ifdef OPENSSL
  #include "ntp_crypto.h"
  #endif /* OPENSSL */
 +#include <ntp_random.h>
  
  #include <isc/boolean.h>
+ #include <isc/list.h>
  
  /*
   * Calendar arithmetic - contributed by G. Healton

diff --cc include/ntpd.h
Simple merge

diff --cc ntpd/ntp_crypto.c
Simple merge

diff --cc ntpd/ntp_monitor.c
Simple merge

diff --cc ntpd/ntp_peer.c
Simple merge