Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-sec

into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2909

bk: 56125b40_p9f4bL9CtVZi7UXajxRKQ

diff --cc ChangeLog
index 49036a540c224e100a97ff9313a19d59713f8a52,f668e1295d690ff2b210c847aafa494e9ae40bd4..9c7390af2a6e366bd79621337af501269eaa3aa0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,11 @@@
  ---
 +* [Sec 2899] CVE-2014-9297  perlinger@ntp.org
 +* [Sec 2902] configuration directives "pidfile" and "driftfile"
 +  should be local-only. perlinger@ntp.org (patch by Miroslav Lichvar)
+ * [Sec 2909] added missing call to 'free()' in ntp_crypto.c. perlinger@ntp.org
 +* [Bug 2332] (reopened) Exercise thread cancellation once before dropping
 +  privileges and limiting resources in NTPD removes the need to link
 +  forcefully against 'libgcc_s' which does not always work. J.Perlinger
  * [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.
  * [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
  * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.

diff --cc ntpd/ntp_crypto.c
Simple merge