Merge branch 'stable' from 1.24.1

Author: kinnison

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.24.1] - 2021-04-27
+
+This bugfix release [corrects an oversight][pr#2738] in the code we introduced to check for
+unknown proxy names. The original change accidentally omitted the `rustfmt` and
+`cargo-fmt` proxies due to a quirk of the fact those proxies were not originally
+part of a Rust component.
+
+We're sorry for pain this may have caused.
+
+[pr#2738]: https://github.com/rust-lang/rustup/pull/2738
+
 ## [1.24.0] - 2021-04-27
 
 This release is mostly a bugfix and quality of life improvement release. However

Cargo.lock

@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 name = "rustup"
 readme = "README.md"
 repository = "https://github.com/rust-lang/rustup"
-version = "1.24.0"
+version = "1.24.1"
 
 [features]
 curl-backend = ["download/curl-backend"]

Cargo.toml

@@ -25,7 +25,7 @@ RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT:-https://static.rust-lang.org/rustup}"
 #XXX: If you change anything here, please make the same changes in setup_mode.rs
 usage() {
     cat 1>&2 <<EOF
-rustup-init 1.24.0 (a33760ade 2021-04-27)
+rustup-init 1.24.1 (773cbef06 2021-04-27)
 The installer for rustup
 
 USAGE: