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

into  psp-deb1.ntp.org:/home/stenn/ntp-dev-sec

bk: 54926f81l4wj7rTE7rxqXSc5iP9mNA

diff --cc ChangeLog
index de193864c0f4728322c002364b4c139c4e73519a,43294236a3c9bf54679743c683070c7e584ef2cc..ef9ccdb90608036f7ddcd38cbc0a20bb611cfb27
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,4 +1,10 @@@
 +* [Sec 2666] Use cryptographic random numbers for md5 key generation.
 +* [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.
 +* [Sec 2672] On some OSes ::1 can be spoofed, bypassing source IP ACLs.
+ * [Bug 2687] RefClock 26/hpgps doesn't work at default line speed
  (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>