Merge remote-tracking branch 'upstream-public/pr/1396' into mbedtls-2.1-proposed
diff --git a/ChangeLog b/ChangeLog
index dd04b1d..683a028 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,9 @@
      Alex Hixon.
    * Allow configuring the shared library extension by setting the DLEXT
      environment variable when using the project makefiles.
+   * Verify that when (f_send, f_recv and f_recv_timeout) send or receive
+     more than the required length an error is returned. Raised by
+     Sam O'Connor in #1245.
 
 = mbed TLS 2.1.11 branch released 2018-03-16