commit c86993e33c54ec4629f5b5a1902095dd8b5833ef
author Simon Butcher <simon.butcher@arm.com> Thu Sep 27 09:48:54 2018 +0100
committer Simon Butcher <simon.butcher@arm.com> Thu Sep 27 09:48:54 2018 +0100
tree 084df155feb734ba94a383fe30cb196123149341
parent 53546ea099f6f53d0be653a64accd250e170337f
parent 5e863e02ac202341beceb33942fa6f63ec37d56d

Merge remote-tracking branch 'public/pr/1970' into development

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 820c26b..e6b4e26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS x.x.x branch released xxxx-xx-xx
+
+Bugfix
+   * Fix a bug in the update function for SSL ticket keys which previously
+     invalidated keys of a lifetime of less than a 1s. Fixes #1968.
+
+Changes
+   * Add tests for session resumption in DTLS.
+
 = mbed TLS 2.13.1 branch released 2018-09-06
 
 API Changes