Merge branch 'upstream-curl' into update-curl

* upstream-curl:
  curl 2020-08-19 (9d954e49)