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

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p12-sec

bk: 5b52b620rBEUTLmJIBjUTq0Po0keog

diff --cc ChangeLog
index 60c002f3a511a0c221bbead844d1c3aaacf2a000,29c037bd016fd021a00ab54bf189836adc2d4d77..ce13b704a181be8020494c104b488d12e536d006
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,8 @@@
  ---
  
 +* [Sec 3505] CVE-2018-12327 - Arbitrary Code Execution Vulnerability
 +  - fixed stack buffer overflow in NTPQ/NTPDC <perlinger@ntp.org>
+ * [Sec 3012] noepeer tweaks.  <stenn@ntp.org>
  * [Bug 3506] Service Control Manager interacts poorly with NTPD <perlinger@ntp.org>
    - changed interaction with SCM to signal pending startup
  * [Bug 3486] Buffer overflow in ntpq/ntpq.c:tstflags() <perlinger@ntp.org>