From 2a1524ccb5308f937ec0d5755fb165a627bf1b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Wed, 27 May 2015 17:59:46 +0200
Subject: [PATCH] Manually merge 1.3 changelog

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5ed802507..4843341a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -179,6 +179,8 @@ Features
      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