Merge remote-tracking branch 'upstream-public/pr/1296' into HEAD

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index dd72d5b..eb8801a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,10 @@
      In the context of SSL, this resulted in handshake failure. Reported by
      daniel in the Mbed TLS forum. #1351
    * Fix Windows x64 builds with the included mbedTLS.sln file. #1347
+   * Fix setting version TLSv1 as minimal version, even if TLS 1
+     is not enabled. Set MBEDTLS_SSL_MIN_MAJOR_VERSION
+     and MBEDTLS_SSL_MIN_MINOR_VERSION instead of
+     MBEDTLS_SSL_MAJOR_VERSION_3 and MBEDTLS_SSL_MINOR_VERSION_1. #664
 
 Changes
    * Fix tag lengths and value ranges in the documentation of CCM encryption.