commit 823c915e594c2bbff0b8d77fb1dceb4b3d73341d
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Jul 02 12:05:49 2018 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Jul 02 12:05:49 2018 +0200
tree 5658a0a7b178614f48f68ecba58299081ef9f926
parent 95e2ecae95dde7772b1f0e98d572d8a7ba158ebf

Fix mis-merged ChangeLog

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1d1ec7c..ab5a017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
      in ECP, ECDSA, PK and X509 (CRL not supported yet), and using existing
      functions in ECDH and SSL (currently only implemented client-side, for
      ECDHE-ECDSA ciphersuites with TLS 1.2, including client authentication).
+
+= mbed TLS 2.11.0 branch released 2018-06-18
+
+Features
    * Add additional block mode, OFB (Output Feedback), to the AES module and
      cipher abstraction module.
    * Implement the HMAC-based extract-and-expand key derivation function