Merge remote-tracking branch 'upstream-public/pr/1055' into development
diff --git a/ChangeLog b/ChangeLog
index bb6222d..24cf993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,8 @@
      failed, the error may not be noticed by the function
      mbedtls_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 2.6.0 branch released 2017-08-10