Merge branch 'stable'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --cc debian/changelog
index 92868592a6ab9db9872ec08abd45de7b8fc96d5b,7900c925d91e1cc3e8f0a45db2f335ba0ef5e47c..1d57cfa9e610ca1397866cdd0877b678599c27d0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,40 +1,54 @@@
 +dgit (4.1~) experimental; urgency=medium
 +
 +  Internal changes:
 +  * using-these: New script to help with ad-hoc-testing.
 +
 + --
 +
 +dgit (4.0) experimental; urgency=low
 +
 +  * dgit: --deliberately-not-fast-forward works properly in
 +    split view quilt modes (suppressing the pseudomerge).
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 12 Feb 2017 22:22:31 +0000
 +
+ dgit (3.12~) unstable; urgency=medium
+ 
+   Important bugfixes to dgit:
+   * Pass --no-renames to git diff-tree -z, avoiding potential trouble.
+   * Defend against commit subject lines which would generate patches which
+     look like series files, etc.  Involves adding .patch to all generated
+     patch filenames.
+ 
+  --
+ 
+ dgit (3.11) unstable; urgency=high
+ 
+   Important bugfixes to dgit:
+   * Fix rpush+buildinfo: Transfer buildinfos for signing.  Closes:#867693.
+   * Cope if the archive server sends an HTTP redirect,
+     by passing -L to curl.  Closes:#867185,#867309.
+   * Cope with newer git which hates --local outside a tree.  Closes:#865863.
+   * rpush: Honour local git config from build host working tree.
+   * Tolerate compressor terminating with SIGPIPE.  Closes:#857694.
+   * Honour more pre-tree git config options in our private trees sharing
+     the user's object store.  In particular, core.sharedRepository.
+     Prompted by #867603.
+   * Clone multisuite works even without --no-rm-on-error.  Closes:#867434.
+   * Work if "git init" does not create $GIT/info.  Closes:#858054.
+   * Actually understand foo,-security (!)  Closes:#867189.
+ 
+   Important bugfixes to other components:
+   * dgit-badcommit-fixup: Honour core.sharedRepository.   Closes:#867603.
+   * infrastructure: Cope with new git-receive-pack which has
+     quarantine feature: ie, work around #867702.
+ 
+   Test suite:
+   * Cope with git restricting ext:: protocols.
+   * multisuite: Test clone without --rm-on-error.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 08 Jul 2017 22:40:15 +0100
+ 
  dgit (3.10) unstable; urgency=medium
  
    Bugfixes:

diff --cc dgit
Simple merge