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

[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 b74ed31f90ec43a7666cf622a6547d6d670e1692 Merge: 75d9db9e5 a95cfb8a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:21:46 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" merge to avoid cherry-picked copy of #25512 fix, which is already in this branch.

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 61c13936015493a5b7224887b6a319db761f9983 Merge: 5b3a7c7c0 b74ed31f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:22:13 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4

1 0

[translation/support-https] Update translations for support-https
by translation＠torproject.org 09 Jul '18

09 Jul '18

commit 86ae660b3dd84082538c954aa1e3242fd653979b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 9 13:19:27 2018 +0000 Update translations for support-https --- sv.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv.json b/sv.json index 625e41dd5..f3fb3e43e 100644 --- a/sv.json +++ b/sv.json @@ -2,7 +2,7 @@ "https-1": { "id": "#https-1", "control": "https-1", - "title": "When I'm using Tor, can eavesdroppers still see the information I share with websites, like login information and things I type into forms?", + "title": "När jag använder Tor, kan tjuvlyssnare fortfarande se information som jag delar med webbsidor, till exempel inloggningsinformation och information som skrivs in i formulär?", "description": "<p class=\"mb-3\">Tor protects eavesdroppers from learning sites that you visit. However, information sent unencrypted over the internet using plain HTTP can still be intercepted by exit relay operators or anyone observing the traffic between your exit relay and your destination website. If the site you are visiting uses HTTPS, then the traffic leaving your exit relay will be encrypted, and won't be visible to eavesdroppers.</p><div class=\"row\"><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image2.png\" alt=\"https\"><div class=\"card-body\"><h4 class=\"card-title\">If you are using HTTPS, your website URL will begin with \"https://\".</h4></div></div></div><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image6.png\" alt=\"https\"><div class=\"card-body\"><h4 class=\"card-title\">This visualization shows what information is visible to eavesdroppers with and without Tor Br owser and HTTPS encryption.</h4></div></div></div></div>" } }

1 0

[tor/maint-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/maint-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/maint-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/maint-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/maint-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/master] 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/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 09 Jul '18

09 Jul '18

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

1 0