Merge branch 'master' into proxy

diff --cc CHANGELOG
index e9ea6cb909e6ff2b78289e56785e3a994758e3d4,6084853799671574dd021005d657516f7e9f591a..125a72c9ea4ae614f91051aecb8a4b385dae4159
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -7,11 -3,11 +7,13 @@@ git-annex (10.20240532) UNRELEASED; urg
    * Fix a bug where interrupting git-annex while it is updating the
      git-annex branch for an export could later lead to git fsck
      complaining about missing tree objects.
 -  * Tab completion of options like --from now includes special remotes.
 +  * Tab completion of options like --from now includes special remotes,
 +    as well as proxied remotes and clusters.
 +  * P2P protocol version 2.
    * Fix Windows build with Win32 2.13.4+
      Thanks, Oleg Tolmatcev
+   * When --debugfilter or annex.debugfilter is set, avoid propigating
+     debug output from git-annex-shell, since it cannot be filtered.
  
   -- Joey Hess <id@joeyh.name>  Mon, 03 Jun 2024 13:03:21 -0400
  

diff --cc Remote/Helper/Ssh.hs
Simple merge