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

into  psp-fb1.ntp.org:/a/etc/amd.net/nfs-stor0.ntfo.org/root/nfs/home/stenn/ntp-stable-3540

bk: 5c05095d2XQa6KXEESyvoQK9TOteIA

diff --cc ChangeLog
index d2bd4fcb310ae0313e275a4741d80b3ddfba250a,c768bde310a49621fe1863723be416e7268b4124..e56f4edffa4198d5b68f328a61a8abcec50de10a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,6 +1,22 @@@
  ---
 +(4.2.8p13)
 +
+ * [Bug 3540] Cannot set minsane to 0 anymore <perlinger@ntp.org>
+   - applied patch by Andre Charbonneau
 +* [Bug 3539] work_fork build fails when droproot is not supported <perlinger@ntp.org>
 +  - applied patch by Baruch Siach
 +* [Bug 3538] Build fails for no-MMU targets <perlinger@ntp.org>
 +  - applied patch by Baruch Siach
 +* [Bug 3535] libparse won't handle GPS week rollover <perlinger@ntp.org>
 +  - refactored handling of GPS era based on 'tos basedate' for
 +    parse (TSIP) and JUPITER clocks
 +* [Bug 3529] Build failures on Mac OS X 10.13 (High Sierra) <perlinger@ntp.org>
 +  - patch by Daniel J. Luke; this does not fix a potential linker
 +    regression issue on MacOS.
 +* [Bug 3526] Incorrect poll interval in packet <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3471] Check for openssl/[ch]mac.h.  <perlinger@ntp.org>
 +  - added missing check, reported by Reinhard Max <perlinger@ntp.org>
  
  ---
  (4.2.8p12) 2018/08/14 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_config.c
Simple merge