Merge stenn.chi1.ntfo.org:/home/nfs1.chi1/hart/ntp-stable-3871

into  stenn.chi1.ntfo.org:/home/nfs1.chi1/harlan/ntp-stable

bk: 653a1ff1xejbrD0Ea7OEPvKEwsVZYA

diff --cc ChangeLog
index 552ca4f00399ccc533554aa47a5bfae289e37965,1dc380cef42d5f39929f1155f232367c91075c7b..25f5ad5a04a4b33ba73cf12471665bcb64b9db89
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,10 +1,13 @@@
  ---
  
 +* [Bug 3872] Ignore restrict mask for hostname. <hart@ntp.org>
+ * [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails.
+              Reported by Hans Mayer.  Moved NONEMPTY_TRANSLATION_UNIT
+              declaration from ntp_types.h to config.h.  <hart@ntp.org>
  * [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs.
               Reported by PoolMUC@web.de. <hart@ntp.org>
 +* [Bug 3868] Cannot restrict a pool peer. <hart@ntp.org>  Thanks to
 +             Edward McGuire for tracking down the deficiency.
  * [Bug 3859] Use NotifyIpInterfaceChange on Windows ntpd. <hart@ntp.org>
  * [Bug 3856] Enable Edit & Continue debugging with Visual Studio.
               <hart@ntp.org>