Merge bk://bk.ntp.org/ntp-dev

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-sec

bk: 548bd1800vh-yfQetwMqVGDmB8OG-Q

diff --cc ChangeLog
index 0de380a8e5ba2cc4437ec009a9f291b162af588f,8600853ef720ef6c3c80115b2b6d06b3937d784b..d9473edea00a644f17881b6eccae45b8aba702f0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,4 +1,8 @@@
 +* [Sec 2667] buffer overflow in crypto_recv().
 +* [Sec 2668] buffer overflow in ctl_putdata().
 +* [Sec 2669] buffer overflow in configure().
 +* [Sec 2670] Missing return; from error clause.
+ (4.2.7p485-RC) 2014/12/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2686] refclock_gpsdjson needs strtoll(), which is not always present.
  (4.2.7p484-RC) 2014/12/11 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.7p483) 2014/12/08 Released by Harlan Stenn <stenn@ntp.org>