Manually merge 1.3 changelog

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5ed8025..4843341 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -179,6 +179,8 @@
      errors on use of deprecated functions.
 
 Bugfix
+   * Fix memory leak when gcm_setkey() and ccm_setkey() are used more than
+     once on the same context.
    * Fix bug in ssl_mail_client when password is longer that username (found
      by Bruno Pape).
    * Fix undefined behaviour (memcmp( NULL, NULL, 0 );) in X.509 modules