Merge branch 'upstream-curl' into update-curl

* upstream-curl:
  curl 2024-07-24 (5040f7e9)