From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 25 Dec 2017 13:05:16 +0000 (-0800)
Subject: Merge psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-p11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dde88f991060c0df90d35d71622e73459242396;p=thirdparty%2Fntp.git

Merge psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-p11
into  psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-aes128cmac

bk: 5a40f78cmWUJFmaM8Nt0iW5O-Osu3Q
---

1dde88f991060c0df90d35d71622e73459242396