From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 3 Feb 2018 13:22:34 +0000 (-0800)
Subject: Merge max.pfcs.com:/homes/harlan/src/ntp-stable-p11
X-Git-Tag: NTP_4_2_8P11~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d797a160b6d0540a5659788e2412c3e39f6bf507;p=thirdparty%2Fntp.git

Merge max.pfcs.com:/homes/harlan/src/ntp-stable-p11
into  max.pfcs.com:/homes/harlan/src/ntp-stable-p11-3452

bk: 5a75b79amX1EI6JpJZkckOEP9IJ2kw
---

d797a160b6d0540a5659788e2412c3e39f6bf507