tree 4300d152e4acc9c7c745ae6ccb45b65b334b1560
parent 4aa6f12d0cdd94e5a46f6cceba54d81976fc168a
parent 4b133e6dcf8cd1a05b6a05949f0db3996d39a7ef
author Gilles Peskine <Gilles.Peskine@arm.com> 1513709384 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1513709384 +0100

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