commit 13188782a0d205e8576e48eb0835e196f8aa485c
author Simon Butcher <simon.butcher@arm.com> Fri May 11 16:41:07 2018 +0100
committer Simon Butcher <simon.butcher@arm.com> Fri May 11 16:41:07 2018 +0100
tree f34712fbc9f496ccc5c1d5271fd90b5d4cf67c6e
parent 879e62697e2da35b1517b733cf9b2e8318b8d98e

Fix up ChangeLog following rebase to mbedtls-2.1.12

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 662ed8f..23461be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS 2.1.13 branch released 2018-xx-xx
+
+Bugfix
+   * Added the macro MBEDTLS_X509_MAX_FILE_PATH_LEN that enables the user to
+     configure the maximum length of a file path that can be buffered when
+     calling mbedtls_x509_crt_parse_path().
+
 = mbed TLS 2.1.12 branch released 2018-04-30
 
 Security
@@ -44,9 +51,6 @@
      buffer.
    * Fix invalid buffer sizes passed to zlib during record compression and
      decompression.
-   * Added the macro MBEDTLS_X509_MAX_FILE_PATH_LEN that enables the user to
-     configure the maximum length of a file path that can be buffered when
-     calling mbedtls_x509_crt_parse_path().
 
 Changes
    * Improve testing in configurations that omit certain hashes or