tree e4edd44cfc4bda208459a929c9088d8e57976af6
parent dfd5ea239de7128c318b60cce4fb77a9f5e00010
parent 8bad3ab45f91fed28b6ba658b0b2a70bf6f84e59
author Gilles Peskine <Gilles.Peskine@arm.com> 1585147663 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1585147663 +0100

Merge remote-tracking branch 'upstream-crypto/development' into HEAD

Conflicts:
* .github/issue_template.md, .github/pull_request_template.md:
  The changes in Mbed Crypto are not relevant to Mbed TLS. Keep the
  mbedtls versions.