From eb355e031e86a229b8d8375a5112f8484198373b Mon Sep 17 00:00:00 2001
From: "Chelsea H. Komlo" <chelsea.komlo@gmail.com>
Date: Sun, 9 Jul 2017 22:33:34 -0400
Subject: [PATCH 1/2] use CARGO_HOME instead of HOME when building with rust

---
 src/rust/tor_util/include.am | 2 +-
 src/test/test_rust.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am
index 17a755fe0..f0cd63920 100644
--- a/src/rust/tor_util/include.am
+++ b/src/rust/tor_util/include.am
@@ -7,7 +7,7 @@ EXTRA_DIST +=\
 src/rust/target/release/libtor_util.a: FORCE
 	( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
-		HOME="$(abs_top_builddir)/src/rust" \
+		CARGO_HOME="$(abs_top_builddir)/src/rust" \
 		$(CARGO) build --release --quiet $(CARGO_ONLINE) )
 
 FORCE:
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 4427c70f1..d559f94ce 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -7,7 +7,7 @@ exitcode=0
 
 for crate in $crates; do
     cd "${abs_top_srcdir:-.}/src/rust/${crate}"
-    CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1
+    CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1
 done
 
 exit $exitcode

From 8de1b94b9db9156e1d8cdce9fab8a911cdb1ee43 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Thu, 13 Jul 2017 18:01:54 +0000
Subject: [PATCH 2/2] Add a changes file for bug22830.

---
 changes/bug22830 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changes/bug22830

diff --git a/changes/bug22830 b/changes/bug22830
new file mode 100644
index 000000000..123b725af
--- /dev/null
+++ b/changes/bug22830
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+   - Fix a problem with Rust toolchains not being found when building
+     without --enable-cargo-online-mode, due to setting the $HOME
+     environment variable instead of $CARGO_HOME.  Fixes bug 22830;
+     fix by Chelsea Komlo.  Bugfix on 0.3.1.1-alpha.