tree 983519b13a7b70b9be2e8be06e5613b944e9b9c2
parent 5ec51f923a11dbb3c38ceab4a1830e25a6449482
parent 1fce45da6a7cdcb8fb300bcd9a23f0526d83a9e7
author Gilles Peskine <Gilles.Peskine@arm.com> 1584982927 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1584982927 +0100

Merge 'mbedtls/development' into merge-crypto-unremoved-20200304

Merge the latest state of the target branch (mbedtls/development) into the
pull request to merge mbed-crypto into mbedtls.

Conflicts:

* ChangeLog: add/add conflict. Resolve by using the usual section order.