Merge remote-tracking branch 'upstream-public/pr/1887' into mbedtls-2.1
diff --git a/ChangeLog b/ChangeLog
index 3020633..88036e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 Bugfix
    * Fixes an issue with MBEDTLS_CHACHAPOLY_C which would not compile if
      MBEDTLS_ARC4_C and MBEDTLS_CIPHER_NULL_CIPHER weren't also defined. #1890
+   * Fix a memory leak in ecp_mul_comb() if ecp_precompute_comb() fails.
+     Fix contributed by Espressif Systems.
 
 = mbed TLS 2.1.14 branch released 2018-07-25