August 2020 - tor-commits - lists.torproject.org

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 13 Aug '20

13 Aug '20

commit 6197338770858b61dcf026e3b1bf4e3883911d11 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 06:45:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- es/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 04f059a186..297e212c6d 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -8,9 +8,9 @@ # B. K., 2016 # BL <tresemes3(a)gmail.com>, 2014 # Edward Navarro, 2015 -# Emma Peel, 2017-2019 +# Emma Peel, 2017-2020 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016,2019-2020 -# Ignacio Rodríguez <inactive+i5o(a)transifex.com>, 2015 +# bc924fe90c926b8dcada96887d40a4a2_902251c <c6d7b347af3e36c88d0308bb5d051bc6_321112>, 2015 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 # Noel Torres <envite(a)rolamasao.org>, 2013 # Paola Falcon <cacoepy(a)gmail.com>, 2014 @@ -18,15 +18,15 @@ # Jonis <srvial(a)hotmail.com>, 2014 # strel, 2013-2016 # strel, 2012 -# Werwolf NS <inactive+WerwolfNS(a)transifex.com>, 2017 +# a2a88775cc892af6e2ec2f3b52cf1e3c_7cf0945 <bd053ebb816fdc422dcaa92aa8c07b67_544217>, 2017 # 322ccc6cfb939d448f1137bdc72c015b, 2016 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 17:09+0000\n" -"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" +"PO-Revision-Date: 2020-08-13 06:40+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -304,7 +304,7 @@ msgid "" "the pseudo-mechanism \"None\". The following list briefly explains how these\n" "mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" "mechanisms is." -msgstr "" +msgstr "BridgeDB implementa cuatro mecanismos para distribuir los puentes: \"HTTPS\", \"Moat\",\n\"Email\" y \"Reserved\". Los puentes que no se distribuyen por BridgeDB utilizan el \nseudo-mecanismo \"None\". La siguiente lista explica brevemente cómo funcionan estos\nmecanismos y nuestras%smedidas de BridgeDB%s qué popular es cada uno\nde los mecanismos." #: bridgedb/strings.py:115 #, python-format

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 13 Aug '20

13 Aug '20

commit 763fc15be78de33eb88c8f90dfd37a421d3d20dc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 06:45:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- es/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 4941e14d79..b73ef98db9 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -8,9 +8,9 @@ # B. K., 2016 # BL <tresemes3(a)gmail.com>, 2014 # Edward Navarro, 2015 -# Emma Peel, 2017-2019 +# Emma Peel, 2017-2020 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016,2019-2020 -# Ignacio Rodríguez <inactive+i5o(a)transifex.com>, 2015 +# bc924fe90c926b8dcada96887d40a4a2_902251c <c6d7b347af3e36c88d0308bb5d051bc6_321112>, 2015 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 # Noel Torres <envite(a)rolamasao.org>, 2013 # Paola Falcon <cacoepy(a)gmail.com>, 2014 @@ -18,15 +18,15 @@ # Jonis <srvial(a)hotmail.com>, 2014 # strel, 2013-2016 # strel, 2012 -# Werwolf NS <inactive+WerwolfNS(a)transifex.com>, 2017 +# a2a88775cc892af6e2ec2f3b52cf1e3c_7cf0945 <bd053ebb816fdc422dcaa92aa8c07b67_544217>, 2017 # 322ccc6cfb939d448f1137bdc72c015b, 2016 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 17:09+0000\n" -"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" +"PO-Revision-Date: 2020-08-13 06:40+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -268,7 +268,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "Otra forma de conseguir puentes es enviando un correo electrónico a%s. Deja el asunto del \ncorreo vacío y escribe \"get transport obfs4\"en el cuerpo del mensaje del correo. Ten en cuenta\nde que tienes que enviar el correo usando la dirección de uno de los siguientes proveedores\nde correo: %s o %s." +msgstr "Otra forma de conseguir puentes es enviando un correo electrónico a%s. Deja el asunto del \ncorreo vacío y escribe \"get transport obfs4\"en el cuerpo del mensaje del correo. Ten en cuenta\nque tienes que enviar el correo usando la dirección de uno de los siguientes proveedores\nde correo: %s o %s." #: bridgedb/strings.py:94 msgid "My bridges don't work! I need help!" @@ -293,7 +293,7 @@ msgstr "¡Obtener puentes!" #: bridgedb/strings.py:107 msgid "Bridge distribution mechanisms" -msgstr "Mecanismos de distribución del puente" +msgstr "Mecanismos de distribución de puentes" #. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". #: bridgedb/strings.py:109

1 0

[tor/master] Make test_glob() pass even when run as root.
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 7b4716a7624b73e60f70485ac577ef6cf884e67c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 20:36:23 2020 -0400 Make test_glob() pass even when run as root. Previously the test relied on not being able to look inside 000 directories, which is a thing root _can_ do. Bug not in any released Tor version. --- src/test/test_util.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 230f2c7034..0e2550d5c5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4622,11 +4622,14 @@ test_util_glob(void *ptr) TEST("\\*"); EXPECT_EMPTY(); - // test forbidden directory - tor_asprintf(&pattern, "%s"PATH_SEPARATOR"*"PATH_SEPARATOR"*", dirname); - results = tor_glob(pattern); - tor_free(pattern); - tt_assert(!results); + if (getuid() != 0) { + // test forbidden directory, if we're not root. + // (Root will be able to see this directory anyway.) + tor_asprintf(&pattern, "%s"PATH_SEPARATOR"*"PATH_SEPARATOR"*", dirname); + results = tor_glob(pattern); + tor_free(pattern); + tt_assert(!results); + } #endif #undef TEST

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5 Merge: 02bb719a94 aeafb7f44f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 34 +++++++++++++++++++++++++++++----- scripts/ci/ci-driver.sh | 34 +++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 16 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 146e4cfa95c3d0cd26f0804e186b2d445a3f771c Merge: f94ad3d32a 34919368ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 34 +++++++++++++++++++++++++++++----- scripts/ci/ci-driver.sh | 34 +++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 16 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 34919368cebb1e635d10694d8ec42911db909130 Merge: 309eafbc3c 07f0210a05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 34 +++++++++++++++++++++++++++++----- scripts/ci/ci-driver.sh | 34 +++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 16 deletions(-)

1 0

[tor/release-0.4.4] CI: Turn on stem with 044 and later.
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 41a7ab96e578e58f277b34f5735d35a2a168da09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 20:13:18 2020 -0400 CI: Turn on stem with 044 and later. --- .gitlab-ci.yml | 7 +++---- scripts/ci/ci-driver.sh | 34 +++++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ed615687b..c77e78764d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,7 @@ variables: paths: - artifacts/ +# This template .apt-template: &apt-template | export LC_ALL=C.UTF-8 echo Etc/UTC > /etc/timezone @@ -90,9 +91,7 @@ debian-minimal: - ./scripts/ci/ci-driver.sh -# TODO: This one just takes too long to finish right now! -# Maybe we need to divide the call to ./src/test/test into a few segments, -# that all end in similar amount of time? +# TODO: This will be faster once we merge #40098 and #40099. debian-hardened: image: debian:testing <<: *debian-template @@ -128,6 +127,6 @@ debian-integration: variables: CHECK: "no" CHUTNEY: "yes" - # STEM: "yes" -- currently failing on <044. + STEM: "yes" script: - ./scripts/ci/ci-driver.sh diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 6faffd7b40..527bba82e5 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') # Use variables like these when we need to behave differently depending on # Tor version. Only create the variables we need. TOR_VER_AT_LEAST_043=no +TOR_VER_AT_LEAST_044=no # These are the currently supported Tor versions; no need to work with anything # ancient in this script. case "$TOR_VERSION" in 0.3.*) TOR_VER_AT_LEAST_043=no + TOR_VER_AT_LEAST_044=no ;; 0.4.[012].*) TOR_VER_AT_LEAST_043=no + TOR_VER_AT_LEAST_044=no + ;; + 0.4.3.*) + TOR_VER_AT_LEAST_043=yes + TOR_VER_AT_LEAST_044=no ;; *) TOR_VER_AT_LEAST_043=yes + TOR_VER_AT_LEAST_044=yes ;; esac @@ -427,21 +435,25 @@ fi if [[ "${STEM}" = "yes" ]]; then start_section "Stem" - # XXXX This shold probably be part some test-stem make target. - if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \ - python3 "${STEM_PATH}/run_tests.py" \ - --tor src/app/tor \ - --integ --test control.controller \ - --test control.base_controller \ - --test process \ - --log TRACE \ - --log-file stem.log ; then - hooray "Stem tests have succeeded" - else + if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then + # XXXX This shold probably be part some test-stem make target. + if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \ + python3 "${STEM_PATH}/run_tests.py" \ + --tor src/app/tor \ + --integ --test control.controller \ + --test control.base_controller \ + --test process \ + --log TRACE \ + --log-file stem.log ; then + hooray "Stem tests have succeeded" + else error "Stem output:" runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log runcmd grep -v "SocketClosed" stem.log | tail -1000 FAILED_TESTS="${FAILED_TESTS} stem" + fi + else + skipping "Stem: broken with <= 0.4.3. See bug tor#40077" fi end_section "Stem" fi

1 0

[tor/release-0.4.3] Improve comments in .gitlab-ci.yml
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit aeafb7f44f07136101c06ea2986b295ef9915c9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 20:20:58 2020 -0400 Improve comments in .gitlab-ci.yml --- .gitlab-ci.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c77e78764d..176c71f8f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,12 +58,18 @@ variables: <<: *artifacts-template variables: DEBIAN_FRONTEND: "noninteractive" + # TODO: Using "cache" in this way speeds up our downloads. It would be + # even better, though, to start with a pre-upgraded debian image. + # + # TODO: Will we have to do this differently once we have more than one + # debian version that we're using? cache: key: apt paths: - apt-cache before_script: - *apt-template + # Install patches unconditionally. - apt-get install automake build-essential @@ -77,20 +83,28 @@ variables: pkg-config python3 zlib1g-dev + # Install patches that we only need for some use cases. - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi - if [ "$STEM" = yes ]; then apt-get install timelimit; fi - if [ "$CC" = clang ]; then apt-get install clang; fi + # TODO: This next line should not be debian-only. - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi + # TODO: This next line should not be debian-only. - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi +# Minmal check on debian: just make, make check. +# debian-minimal: image: debian:stable <<: *debian-template script: - ./scripts/ci/ci-driver.sh - +##### +# Run "make check" with a hardened clang on debian stable. This takes +# care of a hardening check, and a compile-with-clang check. +# # TODO: This will be faster once we merge #40098 and #40099. debian-hardened: image: debian:testing @@ -101,6 +115,8 @@ debian-hardened: script: - ./scripts/ci/ci-driver.sh +##### +# Distcheck on debian stable debian-distcheck: image: debian:stable <<: *debian-template @@ -110,6 +126,8 @@ debian-distcheck: script: - ./scripts/ci/ci-driver.sh +##### +# Documentation tests on debian stable: doxygen and asciidoc. debian-docs: image: debian:stable <<: *debian-template @@ -121,6 +139,13 @@ debian-docs: script: - ./scripts/ci/ci-driver.sh +##### +# Integration tests on debian stable: chutney and stem. +# +# TODO: It would be cool if this target didn't have to re-build tor, and +# could instead re-use Tor from debian-minimal. That can be done +# with the 'artifacts' mechanism, in theory, but it would be good to +# avoid having to have a system with hundreds of artifacts. debian-integration: image: debian:stable <<: *debian-template

1 0

[tor/release-0.4.4] Improve comments in .gitlab-ci.yml
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit aeafb7f44f07136101c06ea2986b295ef9915c9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 20:20:58 2020 -0400 Improve comments in .gitlab-ci.yml --- .gitlab-ci.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c77e78764d..176c71f8f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,12 +58,18 @@ variables: <<: *artifacts-template variables: DEBIAN_FRONTEND: "noninteractive" + # TODO: Using "cache" in this way speeds up our downloads. It would be + # even better, though, to start with a pre-upgraded debian image. + # + # TODO: Will we have to do this differently once we have more than one + # debian version that we're using? cache: key: apt paths: - apt-cache before_script: - *apt-template + # Install patches unconditionally. - apt-get install automake build-essential @@ -77,20 +83,28 @@ variables: pkg-config python3 zlib1g-dev + # Install patches that we only need for some use cases. - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi - if [ "$STEM" = yes ]; then apt-get install timelimit; fi - if [ "$CC" = clang ]; then apt-get install clang; fi + # TODO: This next line should not be debian-only. - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi + # TODO: This next line should not be debian-only. - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi +# Minmal check on debian: just make, make check. +# debian-minimal: image: debian:stable <<: *debian-template script: - ./scripts/ci/ci-driver.sh - +##### +# Run "make check" with a hardened clang on debian stable. This takes +# care of a hardening check, and a compile-with-clang check. +# # TODO: This will be faster once we merge #40098 and #40099. debian-hardened: image: debian:testing @@ -101,6 +115,8 @@ debian-hardened: script: - ./scripts/ci/ci-driver.sh +##### +# Distcheck on debian stable debian-distcheck: image: debian:stable <<: *debian-template @@ -110,6 +126,8 @@ debian-distcheck: script: - ./scripts/ci/ci-driver.sh +##### +# Documentation tests on debian stable: doxygen and asciidoc. debian-docs: image: debian:stable <<: *debian-template @@ -121,6 +139,13 @@ debian-docs: script: - ./scripts/ci/ci-driver.sh +##### +# Integration tests on debian stable: chutney and stem. +# +# TODO: It would be cool if this target didn't have to re-build tor, and +# could instead re-use Tor from debian-minimal. That can be done +# with the 'artifacts' mechanism, in theory, but it would be good to +# avoid having to have a system with hundreds of artifacts. debian-integration: image: debian:stable <<: *debian-template

1 0

[tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5 Merge: 02bb719a94 aeafb7f44f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 34 +++++++++++++++++++++++++++++----- scripts/ci/ci-driver.sh | 34 +++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 16 deletions(-)

1 0