tree 342f2da3dfc6b2d9c4b5ef869ee9eb70de7eae10
parent 20b77ecb4a82b9e6a03ecaafa6d0acddf47e61a6
parent 2396abfb8b5fa2fd8a9a63d92aad31293bc96e07
author Jaeden Amero <jaeden.amero@arm.com> 1567703668 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1567703668 +0100

Merge remote-tracking branch 'origin/mbedtls-2.7' into mbedtls-2.7-restricted

* origin/mbedtls-2.7:
  ssl-opt.sh: wait for proxy to start before running the script further