Merge branch 'upstream-curl' into update-curl

* upstream-curl:
  curl 2022-01-05 (801bd513)