Merge branch 'pr_1000' into development-proposed

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 461fc6e..388aea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -102,6 +102,8 @@
      freeing an RSA context and several MPI's without proper initialization
      beforehand.
    * Fix error message in programs/pkey/gen_key.c. Found and fixed by Chris Xue.
+   * Fix programs/pkey/dh_server.c so that it actually works with dh_client.c.
+     Found and fixed by Martijn de Milliano.
 
 Changes
    * Extend cert_write example program by options to set the CRT version