From 83ce8201dcd2739a2350fcfc20d28083653c4e3f Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Sat, 30 Sep 2017 23:39:46 +0100
Subject: [PATCH] Update ChangeLog for fix to #836

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

diff --git a/ChangeLog b/ChangeLog
index 565ea2904..ec9125961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ mbed TLS ChangeLog (Sorted per branch, date)
 Features
    * Allow comments in test data files.
 
+Bugfix
+   * Fix memory leak in mbedtls_ssl_set_hostname() when called multiple times.
+     Found by projectgus and jethrogb, #836.
+
 = mbed TLS 2.6.0 branch released 2017-08-10
 
 Security
@@ -194,8 +198,6 @@ Security
      team. #569 CVE-2017-2784
 
 Bugfix
-   * Fix memory leak in mbedtls_ssl_set_hostname() when called multiple times.
-     Found by jethrogb, #836.
    * Fix output certificate verification flags set by x509_crt_verify_top() when
      traversing a chain of trusted CA. The issue would cause both flags,
      MBEDTLS_X509_BADCERT_NOT_TRUSTED and MBEDTLS_X509_BADCERT_EXPIRED, to be