commit d38464698e428f20f3d62b1ce3d12b69c25865db
author Gilles Peskine <Gilles.Peskine@arm.com> Sun Mar 11 00:10:50 2018 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Sun Mar 11 00:52:35 2018 +0100
tree 8c1e6a981320d56ef8adc714f8c2e8c1fb68326e
parent 0aacc9a96d6b8dc56df5aede98eab7e44d8d5f69
parent 998a4de3fa080287319052ee9b1d420bff960a81

Merge remote-tracking branch 'upstream-public/pr/1295' into mbedtls-2.1-proposed

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index abf96ac..ef91aac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
      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
+   * Fix compilation error on Mingw32 when _TRUNCATE is defined. Use _TRUNCATE
+     only if __MINGW32__ not defined. Fix suggested by Thomas Glanzmann and
+     Nick Wilson on issue #355
 
 Changes
    * Clarified the documentation of mbedtls_ssl_setup.