Merge remote-tracking branch 'origin/pr/2542' into mbedtls-2.16

* origin/pr/2542:
  Add guards for MBEDTLS_X509_CRL_PARSE_C in sample
diff --git a/ChangeLog b/ChangeLog
index 9e46fdc..798e84a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@
      public macro MBEDTLS_X509_ID_FLAG. This could lead to invalid evaluation
      in case operators binding less strongly than subtraction were used
      for the parameter.
+   * Add a check for MBEDTLS_X509_CRL_PARSE_C in ssl_server2, guarding the crl
+     sni entry parameter. Reported by inestlerode in #560.
 
 Changes
    * Return from various debugging routines immediately if the