tree 937bf9df55c4ba949bfb8664f88f7d563d0aef47
parent a6f6947490229548ea47505678c0dccda517203f
parent 00cb3af4abd84a5e74c95bb91ef0d4543baf07e3
author Gilles Peskine <Gilles.Peskine@arm.com> 1511890144 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1511890218 +0100

Merge remote-tracking branch 'upstream-public/pr/1080' into mbedtls-2.1