Merge remote-tracking branch 'mariner/master'

diff --cc debian/changelog
index 17463aacdecb0d4ce1766123b57f71a9d78eda54,4e344808039b6420cc2b6c29ed710b9c23c4be5e..1611b8089fbeaaa4d7124abf9f3963fb287d2841
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,11 +1,23 @@@
 -chiark-utils (5.0.1~citrix1) unstable; urgency=medium
++chiark-utils (5.0.3~) unstable; urgency=medium
+ 
 -  * with-lock-ex: provide -l
+   * git-cache-proxy: Do not spuriously timeout on too many simultaneous
+     invocations (specifically, do not timeout when reacquiring the lock
+     before serving).
+ 
 - -- Ian Jackson <ian.jackson@eu.citrix.com>  Wed, 26 Apr 2017 12:56:02 +0100
++ -- 
++
 +chiark-utils (5.0.2) unstable; urgency=medium
 +
 +  * Portability fix: Fix on libcs where st_mtime is not a macro
 +    (ie, ones lacking st_mtim.)
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 23 Jan 2017 18:12:52 +0000
 +
 +chiark-utils (5.0.1) unstable; urgency=medium
 +
 +  * with-lock-ex: provide -l
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 23 Jan 2017 17:53:50 +0000
  
  chiark-utils (5.0.0) unstable; urgency=medium