July 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit f721a08220fc0bef4e029e3fb87b9160782527c0 Merge: 451a84cec d935aceb2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:13:58 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80 Merge: 1af69c181 f721a0822 Author: Nick Mathewson <nickm(a)torproject.org> 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

1 0

[tor/release-0.3.3] Use correct CARGO_HOME in test_rust.sh
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit d935aceb2b2493999f0982834406a0604a12ab9d Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Jun 21 18:20:03 2018 -0500 Use correct CARGO_HOME in test_rust.sh Out-of-tree builds could fail to run the rust tests if built in offline mode. cargo expects CARGO_HOME to point to the .cargo directory, not the directory containing .cargo. Fixes bug 26455; bug not in any released tor. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 95ffc2e65..c7d0439ad 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -8,7 +8,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do 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"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80 Merge: 1af69c181 f721a0822 Author: Nick Mathewson <nickm(a)torproject.org> 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

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit f721a08220fc0bef4e029e3fb87b9160782527c0 Merge: 451a84cec d935aceb2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:13:58 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 04ce541f8894122cf8eea18ff9fa54a50e22d453 Merge: adbe261f2 f721a0822 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:14:03 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Use correct CARGO_HOME in test_rust.sh
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit d935aceb2b2493999f0982834406a0604a12ab9d Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Jun 21 18:20:03 2018 -0500 Use correct CARGO_HOME in test_rust.sh Out-of-tree builds could fail to run the rust tests if built in offline mode. cargo expects CARGO_HOME to point to the .cargo directory, not the directory containing .cargo. Fixes bug 26455; bug not in any released tor. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 95ffc2e65..c7d0439ad 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -8,7 +8,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do 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"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit f721a08220fc0bef4e029e3fb87b9160782527c0 Merge: 451a84cec d935aceb2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:13:58 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 5b3a7c7c0f2f9e8673a64f795ceff9968e95b2f3 Merge: f701a7c72 75d9db9e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:14:41 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 451a84cecb4bc98fd2ac86aeff1c10c1cac0fd79 Merge: fead22fb2 d3894dc34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:11:41 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-07-03 | 4 + src/config/geoip | 7171 ++++++++++++++++++++-------------------------- src/config/geoip6 | 752 +++-- 3 files changed, 3732 insertions(+), 4195 deletions(-)

1 0