Merge remote-tracking branch 'mariner/master'

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

diff --cc debian/changelog
index 01ca86d5fe0e6b5a3334efc22e89119e79a3df9e,56032aa3709edd3a84f3d764495ddb09c912d801..889d53241ec2878290e476cb74c90dc8ab154472
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,23 @@@
 -chiark-utils (6.0.5~citrix2~) unstable; urgency=medium
++chiark-utils (6.1.0~iwj1+citrix2~) unstable; urgency=medium
+ 
+   * WIP git-cache-proxy gc fix
+ 
+  --
+ 
+ chiark-utils (6.0.5~citrix1) unstable; urgency=medium
+ 
+   * fishdescriptor: Use Python "errno" module, not "os.errno"
+     (which is not in modern python3 apparently).
+ 
+  -- Ian Jackson <ian.jackson@citrix.com>  Fri, 20 Dec 2019 17:50:02 +0000
+ 
 +chiark-utils (6.1.0~iwj1) unstable; urgency=medium
 +
 +  * really: Writeability of rc.local suffices, too.
 +    (Non-sysvinit compatibility.)
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 12 Aug 2019 10:59:02 +0100
 +
  chiark-utils (6.0.4) unstable; urgency=medium
  
    * sync-accounts: Fix perl syntax error.  Closes:#865985.