Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Deprecate HAVE_INT8 and HAVE_INT16
  Deprecate using NET_C without HAVE_IPV6
  Officially deprecate compat-1.2.h and openssl.h
  Document POLARSSL_CAMELLIA_SMALL_MEMORY
  Fix bug with ssl_set_curves() check on client
  Fix bug in POLARSSL_PLATFORM_STD_EXIT support
diff --git a/ChangeLog b/ChangeLog
index 12d9895..4ad8aba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,9 +80,9 @@
      speed and RAM (heap only for now) usage.
    * New script memory.sh helps measuring the ROM and RAM requirements of two
      reduced configurations (PSK-CCM and NSA suite B).
-   * Add config flags POLARSSL_DEPRECATED_WARNING (off by default) to produce
+   * Add config flag POLARSSL_DEPRECATED_WARNING (off by default) to produce
      warnings on use of deprecated functions (with GCC and Clang only).
-   * Add config flags POLARSSL_DEPRECATED_REMOVED (off by default) to produce
+   * Add config flag POLARSSL_DEPRECATED_REMOVED (off by default) to produce
      errors on use of deprecated functions.
 
 Bugfix
@@ -104,6 +104,9 @@
      curve picked by the server was actually allowed.
 
 Changes
+   * Options POLARSSL_HAVE_INT8 and POLARSSL_HAVE_INT16 are deprecated.
+   * Enabling POLARSSL_NET_C without POLARSSL_HAVE_IPV6 is deprecated.
+   * compat-1.2.h and openssl.h are deprecated.
    * Adjusting/overriding CFLAGS and LDFLAGS with the make build syste is now
      more flexible (warning: OFLAGS is not used any more) (see the README)
      (contributed by Alon Bar-Lev).