Merge branch 'master' into exportreeplus

diff --cc Annex/Proxy.hs
Simple merge

diff --cc CHANGELOG
index f1d88870a059fe2c9e65814404037be3cc36291a,80138b8b797eb3d7ead3d5e2d88a8a925ecf83ce..45f07396dd56feccd5e5bc7a2414ea4c9ab6a06d
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,14 -1,9 +1,15 @@@
  git-annex (10.20240732) UNRELEASED; urgency=medium
  
-   * Avoid loading cluster log at startup.
    * Remove debug output (to stderr) accidentially included in
      last version.
 +  * Special remotes configured with exporttree=yes annexobjects=yes 
 +    can store objects in .git/annex/objects, as well as an exported tree.
 +  * Support proxying to special remotes configured with 
 +    exporttree=yes annexobjects=yes.
 +  * git-remote-annex: Store objects in exportree=yes special remotes
 +    in the same paths used by annexobjects=yes.
+   * When proxying an upload to a special remote, verify the hash.
+   * Avoid loading cluster log at startup.
  
   -- Joey Hess <id@joeyh.name>  Wed, 31 Jul 2024 15:52:03 -0400