Merge branch 'upstream-curl' into update-curl

* upstream-curl:
  curl 2024-05-22 (fd567d4f)