Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable-p11

into  ntp.org:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-p11-3455

bk: 5a7fe1bb2nsQ9ahJ2AXst8w897924Q

diff --cc ChangeLog
index 8bdcd4ca1ec8aca09fd2ceadc6a43ec83b20d57f,1fd33d0f059af0338c53c6d55c59b852f59da700..629fa2fc079c274fa57c489f44c1adac65f5f53b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -9,8 -6,8 +9,10 @@@
    - initial patch by <stenn@ntp.org>, extended by <perlinger@ntp.org>
  * [Sec 3412] ctl_getitem(): Don't compare names past NUL. <perlinger@ntp.org>
  * [Sec 3012] Sybil vulnerability: noepeer support.  HStenn, JPerlinger.
 +* [Bug 3457] OpenSSL FIPS mode regression <perlinger@ntp.org>
+ * [Bug 3455] ntpd doesn't use scope id when binding multicast <perlinger@ntp.org>
+  - applied patch by Sean Haugh 
 +* [Bug 3452] PARSE driver prints uninitialized memory. <perlinger@ntp.org>
  * [Bug 3450] Dubious error messages from plausibility checks in get_systime()
   - removed error log caused by rounding/slew, ensured postcondition <perlinger@ntp.org>
  * [Bug 3447] AES-128-CMAC (fixes) <perlinger@ntp.org>

diff --cc ntpd/ntp_io.c
Simple merge