Merge tag 'archive/debian/3.11_deb9u1' into stable

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

diff --cc debian/changelog
index 7900c925d91e1cc3e8f0a45db2f335ba0ef5e47c,5ca1f5c89fae93863e03dad51d54aff381fbfc93..1d912c026b9db5964cc845ca094d80c8b100c149
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,19 @@@
 +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~deb9u1) stretch; urgency=high
+ 
+   * Rebuild and upload to stretch.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 11 Jul 2017 09:28:15 +0100
+ 
  dgit (3.11) unstable; urgency=high
  
    Important bugfixes to dgit: