Merge branch 'pr_1276' into mbedtls-2.1-proposed
diff --git a/ChangeLog b/ChangeLog
index 392e747..d95379c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,11 @@
      overflow. #1179
    * Fix memory allocation corner cases in memory_buffer_alloc.c module. Found
      by Guido Vranken. #639
+   * 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
+     reset it. Found independently by ccli8 on Github.
+   * In mbedtls_entropy_free(), properly free the message digest context.
 
 Changes
    * Clarified the documentation of mbedtls_ssl_setup.