Merge branch 'pr_998' into mbedtls-1.3
diff --git a/ChangeLog b/ChangeLog
index 3aa2250..7903fc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 = mbed TLS 1.3.22 branch released 2017-xx-xx
 
+Features
+   * Allow comments in test data files.
+
 Bugfix
    * Fix memory leak in ssl_set_hostname() when called multiple times.
      Found by projectgus and jethrogb, #836.
@@ -45,9 +48,7 @@
    * Extend cert_write example program by options to set the CRT version
      and the message digest. Further, allow enabling/disabling of authority
      identifier, subject identifier and basic constraints extensions.
-
-Features
-   * Allow comments in test data files.
+   * Improve makefiles on Windows: don't run find, and call perl explicitly.
 
 = mbed TLS 1.3.21 branch released 2017-08-10