Merge branch 'debian/sid' into debian/experimental

diff --cc debian/changelog
index 5c73c3a4ae8a867574996cfbdfce2ea629c36daf,aac1125fd029b2e0b1615d9003548d41d67625d9..20c43064d43f7845b30ef185499fad2cb2270b48
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,27 @@@
 +rustc (1.21.0+dfsg1-2) UNRELEASED; urgency=medium
 +
 +  * Upload to unstable.
 +  * Fix bootstrapping using 1.21.0, which is more strict about redundant &mut
 +    previously used in u-output-failed-commands.patch.
 +
 + -- Ximin Luo <infinity0@debian.org>  Sat, 21 Oct 2017 13:54:43 +0200
 +
 +rustc (1.21.0+dfsg1-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Fix the "install" target for cross-compilations; cross-compiling with
 +    sbuild --host=$foreign-arch should work again.
 +  * Update to latest Standards-Version; changes:
 +    - Priority changed to optional from extra.
 +
 + -- Ximin Luo <infinity0@debian.org>  Tue, 17 Oct 2017 00:42:54 +0200
 +
+ rustc (1.20.0+dfsg1-3) unstable; urgency=medium
+ 
+   * Disable jemalloc to fix FTBFS with 1.21 on armhf.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Wed, 25 Oct 2017 12:01:19 +0200
+ 
  rustc (1.20.0+dfsg1-2) unstable; urgency=medium
  
    * Update changelog entry for 1.20.0+dfsg1-1 to reflect that it was actually

diff --cc debian/config.toml.in
index 54acd0c60fadb4ee32a33f14e4912c70ccb50282,943f7ca851de5708b94a6ae55ed4b1935fe210e5..3a6cbb16e84590554e8e7d48035c5734ef4eb49c
--- 1/debian/config.toml.in
--- 2/debian/config.toml.in
+++ b/debian/config.toml.in
@@@ -26,8 -26,12 +26,10 @@@ llvm-config = "LLVM_DESTDIR/usr/lib/llv
  
  )dnl
  [llvm]
 -link-shared = true
  
  [rust]
 -dist-src = false
+ use-jemalloc = false
+ 
  channel = "RELEASE_CHANNEL"
  
  # parallel codegen interferes with reproducibility, see

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
Simple merge