Merge remote-tracking branch 'upstream-public/pr/936' into mbedtls-2.7-proposed
diff --git a/ChangeLog b/ChangeLog
index 51ad727..372d801 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS x.x.x branch released xxxx-xx-xx
+
+Changes
+   * Clarify the documentation of mbedtls_ssl_setup.
+
 = mbed TLS 2.7.1 branch released 2018-02-23
 
 Default behavior changes