[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm@xxxxxxxxxxxxxx]

commit 75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80
Merge: 1af69c181 f721a0822
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jul 9 09:14:37 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 src/test/test_rust.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/test/test_rust.sh
index b1eae7d5f,c7d0439ad..4ecca7834
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@@ -9,8 -8,8 +9,8 @@@ for cargo_toml_dir in "${abs_top_srcdir
      if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
  	cd "${cargo_toml_dir}" && \
  	    CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
- 	    CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \
+ 	    CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \
 -	    "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \
 +	    "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
  	    ${EXTRA_CARGO_OPTIONS} \
  	    --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
      fi



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits