am 12f2cb24: am 54efc188: Merge "Add support for TLS_FALLBACK_SCSV"

* commit '12f2cb249d9f500e8e173ae304bc7c6a0847f1ad':
  Add support for TLS_FALLBACK_SCSV