Merge remote-tracking branch 'upstream-public/pr/1081' into mbedtls-1.3
diff --git a/ChangeLog b/ChangeLog
index 77e99e3..e7d4f96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
      If a call to one of the functions of the cryptographic primitive modules
      failed, the error may not be noticed by the function pem_read_buffer()
      causing it to return invalid values. Found by Guido Vranken. #756
+   * Include configuration file in md.h, to fix compilation warnings.
+     Reported by aaronmdjones in #1001
 
 = mbed TLS 1.3.21 branch released 2017-08-10