Merge branch 'development' into iotssl-513-alerts
diff --git a/ChangeLog b/ChangeLog
index 2599fe9..fdc66fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,23 @@
 
 = mbed TLS 2.2.0 released 2015-10-xx
 
+Features
+   * Experimental support for EC J-PAKE as defined in Thread 1.0.0.
+     Disabled by default as the specification might still change.
+   * Added a key extraction callback to accees the master secret and key
+     block. (Potential uses include EAP-TLS and Thread.)
+
 Bugfix
-   * Fix bug causing some handshakes to fail due to some non-fatal alerts not
-     begin properly ignored. Found by mancha and Kasom Koht-arsa, #308
+   * Fixed a bug causing some handshakes to fail due to some non-fatal alerts
+     not being properly ignored. Found by mancha and Kasom Koht-arsa, #308
+   * mbedtls_x509_crt_verify(_with_profile)() now also checks the key type and
+     size/curve against the profile. Before that, there was no way to set a
+     minimum key size for end-entity certificates with RSA keys. Found by
+     Matthew Page of Scannex Electronics Ltd.
+
+Changes
+   * Improved performance of mbedtls_ecp_muladd() when one of the scalars is 1
+     or -1.
 
 = mbed TLS 2.1.2 released 2015-10-06