tree aa99971c518b19196523df588985e5e7e0009e43
parent 5166a188eb9e1e18659e06d661b5648e8e12217d
parent 69944b1e67d63e2c5da0b214a82b04f382995552
author Jaeden Amero <jaeden.amero@arm.com> 1522317265 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1522317265 +0100

Merge remote-tracking branch 'upstream-public/pr/1134' into mbedtls-2.7-proposed

Fixes #504 and fixes #1057 for the 2.7 branch