Merge remote-tracking branch 'upstream-public/pr/1455' into mbedtls-2.1-restricted-proposed
diff --git a/ChangeLog b/ChangeLog
index e24eb25..9a40ead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,7 @@
overflow. #1179
* Fix memory allocation corner cases in memory_buffer_alloc.c module. Found
by Guido Vranken. #639
+ * Log correct number of ciphersuites used in Client Hello message. #918
* Fix the entropy.c module to ensure that mbedtls_sha256_init() or
mbedtls_sha512_init() is called before operating on the relevant context
structure. Do not assume that zeroizing a context is a correct way to