Merge remote-tracking branch 'public/pr/2040' into development
diff --git a/ChangeLog b/ChangeLog
index cdfaca2..5cfd9a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
* Include configuration file in all header files that use configuration,
instead of relying on other header files that they include.
Inserted as an enhancement for #1371
+ * Add support for alternative CSR headers, as used by Microsoft and defined
+ in RFC 7468. Found by Michael Ernst. Fixes #767.
= mbed TLS 2.16.0 branch released 2018-12-21