tree ad47e377e22ef0fdd8eeca27034ffc3100e107e5
parent 5e533f43ee4a8cbce217a0f9a9295efb40bcc5a9
parent 41b6189ef71615cfe9e7c3085dba2b3b7e51d8c1
author Gilles Peskine <Gilles.Peskine@arm.com> 1520958409 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1520958409 +0100

Merge remote-tracking branch 'upstream-restricted/pr/360' into mbedtls-2.1-restricted-proposed

Conflicts:
* scripts/config.pl: reconciled parallel edits in a comment.