tree c1a66f2b02c04f555a37110cf2fe714880635b9d
parent 9c8ac0ce2cef93395e15a7493f43d29440fc65af
parent 509fef7de331dd4ec336fc3b5f7b9c19b493b049
author Gilles Peskine <Gilles.Peskine@arm.com> 1511882187 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1511882187 +0100

Merge remote-tracking branch 'upstream-restricted/pr/419' into development-restricted

Resolved simple conflicts caused by the independent addition of
calls to mbedtls_zeroize with sometimes whitespace or comment
differences.