October 2019 - tor-commits - lists.torproject.org

[tor/master] changes: file for 31919
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 9be0324c2cceb61e86bbbc1ecd73266513608f3b Author: teor <teor(a)torproject.org> Date: Thu Oct 24 09:48:37 2019 +1000 changes: file for 31919 --- changes/ticket31919 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/changes/ticket31919 b/changes/ticket31919 new file mode 100644 index 000000000..5344db956 --- /dev/null +++ b/changes/ticket31919 @@ -0,0 +1,13 @@ + o Minor features (developer tools): + - Add a check_cocci_parse.sh script that checks that new code + is parseable by Coccinelle. Add an exceptions file for unparseable + files. Closes ticket 31919. + - Call the check_cocci_parse.sh script from a 'check-cocci' Makefile + target. Closes ticket 31919. + o Minor features (git scripts): + - Call the check_cocci_parse.sh script from the git commit and push hooks. + Closes ticket 31919. + - Skip unmodified source files when doing some existing git hook checks. + Related to ticket 31919. + o Minor features (continuous integration): + - Call the check_cocci_parse.sh script from Travis CI. Closes ticket 31919.

1 0

[tor/master] Travis: Install coccinelle on macOS and Linux
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit c3ff5ad56b3792edd922d776fc36447b69d68854 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 13:49:50 2019 +1000 Travis: Install coccinelle on macOS and Linux And print the spatch version and build details Part of 31919. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index a5f4be1f1..fe0f6d49c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -109,6 +109,8 @@ addons: - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty #- libzstd + ## Optional build dependencies + - coccinelle - shellcheck ## Conditional build dependencies ## Always installed, so we don't need sudo @@ -138,6 +140,7 @@ addons: - pkg-config ## Optional build dependencies - ccache + - coccinelle - shellcheck ## Conditional build dependencies ## Always installed, because manual brew installs are hard to get right @@ -194,6 +197,9 @@ install: - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi ## If we're running stem, show the stem version and commit - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi + ## Get the coccinelle version + ## Installs are unreliable on macOS, so we just rely on brew list --versions + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then spatch --version; fi ## We don't want Tor tests to depend on default configuration file at ## ~/.torrc. So we put some random bytes in there, to make sure we get build ## failures in case Tor is reading it during CI jobs.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1462'
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit f40eb2ead6f166f3f478eabe8766856056169a5a Merge: aff286618 7a5eefd3f Author: teor <teor(a)torproject.org> Date: Fri Oct 25 16:14:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1462' .travis.yml | 6 ++ Makefile.am | 73 ++++++++------- changes/ticket31919 | 13 +++ scripts/coccinelle/check_cocci_parse.sh | 52 +++++++++++ scripts/coccinelle/exceptions.txt | 24 +++++ scripts/coccinelle/try_parse.sh | 25 +++++- scripts/git/pre-commit.git-hook | 78 +++++++++++----- scripts/git/pre-push.git-hook | 153 ++++++++++++++++++-------------- 8 files changed, 301 insertions(+), 123 deletions(-)

1 0

[tor/master] Makefile: Stop using trailing spaces in an EXTRA_DIST clause
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 7a5eefd3f8443a41c40bda363105965909bcec9b Author: teor <teor(a)torproject.org> Date: Fri Oct 25 16:13:16 2019 +1000 Makefile: Stop using trailing spaces in an EXTRA_DIST clause Based on 8-space tabs, the git/less default. Cleanup after 31919. --- Makefile.am | 72 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am index 539541f7f..9866f87f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,42 +158,42 @@ include doc/include.am include contrib/include.am EXTRA_DIST+= \ - ChangeLog \ - CONTRIBUTING \ - CODE_OF_CONDUCT \ - INSTALL \ - LICENSE \ - Makefile.nmake \ - README \ - ReleaseNotes \ - scripts/maint/checkIncludes.py \ - scripts/maint/checkSpace.pl \ - scripts/maint/checkShellScripts.sh \ - scripts/maint/practracker/README \ - scripts/maint/practracker/exceptions.txt \ - scripts/maint/practracker/includes.py \ - scripts/maint/practracker/metrics.py \ - scripts/maint/practracker/practracker.py \ - scripts/maint/practracker/practracker_tests.py \ - scripts/maint/practracker/problem.py \ - scripts/maint/practracker/testdata/.may_include \ - scripts/maint/practracker/testdata/a.c \ - scripts/maint/practracker/testdata/b.c \ - scripts/maint/practracker/testdata/ex0-expected.txt \ - scripts/maint/practracker/testdata/ex0.txt \ - scripts/maint/practracker/testdata/ex1-expected.txt \ - scripts/maint/practracker/testdata/ex1.txt \ - scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ - scripts/maint/practracker/testdata/ex.txt \ - scripts/maint/practracker/testdata/header.h \ - scripts/maint/practracker/testdata/not_c_file \ - scripts/maint/practracker/test_practracker.sh \ - scripts/maint/practracker/util.py \ - scripts/coccinelle/apply.sh \ - scripts/coccinelle/check_cocci_parse.sh \ - scripts/coccinelle/exceptions.txt \ - scripts/coccinelle/test-operator-cleanup \ - scripts/coccinelle/tor-coccinelle.h \ + ChangeLog \ + CONTRIBUTING \ + CODE_OF_CONDUCT \ + INSTALL \ + LICENSE \ + Makefile.nmake \ + README \ + ReleaseNotes \ + scripts/maint/checkIncludes.py \ + scripts/maint/checkSpace.pl \ + scripts/maint/checkShellScripts.sh \ + scripts/maint/practracker/README \ + scripts/maint/practracker/exceptions.txt \ + scripts/maint/practracker/includes.py \ + scripts/maint/practracker/metrics.py \ + scripts/maint/practracker/practracker.py \ + scripts/maint/practracker/practracker_tests.py \ + scripts/maint/practracker/problem.py \ + scripts/maint/practracker/testdata/.may_include \ + scripts/maint/practracker/testdata/a.c \ + scripts/maint/practracker/testdata/b.c \ + scripts/maint/practracker/testdata/ex0-expected.txt \ + scripts/maint/practracker/testdata/ex0.txt \ + scripts/maint/practracker/testdata/ex1-expected.txt \ + scripts/maint/practracker/testdata/ex1.txt \ + scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ + scripts/maint/practracker/testdata/ex.txt \ + scripts/maint/practracker/testdata/header.h \ + scripts/maint/practracker/testdata/not_c_file \ + scripts/maint/practracker/test_practracker.sh \ + scripts/maint/practracker/util.py \ + scripts/coccinelle/apply.sh \ + scripts/coccinelle/check_cocci_parse.sh \ + scripts/coccinelle/exceptions.txt \ + scripts/coccinelle/test-operator-cleanup \ + scripts/coccinelle/tor-coccinelle.h \ scripts/coccinelle/try_parse.sh ## This tells etags how to find mockable function definitions.

1 0

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 24 Oct '19

24 Oct '19

commit 1948bb07e5e842218ce2f70c34b6287228486f98 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 04:22:21 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- es-MX/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-MX/browserOnboarding.properties b/es-MX/browserOnboarding.properties index 86fc019a6..b14663109 100644 --- a/es-MX/browserOnboarding.properties +++ b/es-MX/browserOnboarding.properties @@ -2,7 +2,7 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome +onboarding.tour-tor-welcome=Bienvenido a Tails onboarding.tour-tor-welcome.title=You’re ready. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. onboarding.tour-tor-welcome.next-button=Go to Privacy

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 24 Oct '19

24 Oct '19

commit 72c7811bdb554c1d1a5de1f8adc7b318f97a9cdb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 04:20:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- es-MX/torbrowser_strings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es-MX/torbrowser_strings.dtd b/es-MX/torbrowser_strings.dtd index 646bf359a..6d5d0644d 100644 --- a/es-MX/torbrowser_strings.dtd +++ b/es-MX/torbrowser_strings.dtd @@ -1,6 +1,6 @@  -<!ENTITY firstrun_welcome_tab_title "Welcome"> -<!ENTITY firstrun_welcome_title "You\'re ready."> +<!ENTITY firstrun_welcome_tab_title "Bienvenido a Tails"> +<!ENTITY firstrun_welcome_title "Tor está listo"> <!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> <!ENTITY firstrun_welcome_next "Start now"> <!ENTITY firstrun_privacy_tab_title "Privacidad">

1 0

[translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
by translation＠torproject.org 24 Oct '19

24 Oct '19

commit 529320ce21be2b4c8c11144df3a2f7deff77c6db Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 04:16:45 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml --- es-MX/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/es-MX/strings.xml b/es-MX/strings.xml index cb5acbb4f..b12d2c138 100644 --- a/es-MX/strings.xml +++ b/es-MX/strings.xml @@ -1,2 +1,4 @@ <resources> + <string name="try_tor_browser">Prueba Explorador de Tor</string> + <string name="get_it">Lo consigue de su fuente preferida</string> </resources>

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 24 Oct '19

24 Oct '19

commit 3c0ee4e65047cf34666b19d27b01c34c658e3ad7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 03:46:00 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- es_MX/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_MX/ssl-observatory.dtd b/es_MX/ssl-observatory.dtd index cb17203a4..4e03efa9f 100644 --- a/es_MX/ssl-observatory.dtd +++ b/es_MX/ssl-observatory.dtd @@ -93,7 +93,7 @@ vieron. Situa el raton sobre las opciones para ver mas detalles:"> <!ENTITY ssl-observatory.warning.title "ADVERTENCIA del Observador EFF's SSL"> <!ENTITY ssl-observatory.warning.showcert "Muestra la cadena de certificado"> <!ENTITY ssl-observatory.warning.okay "Entiendo"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificate(s) for this site:"> +<!ENTITY ssl-observatory.warning.text "El Observatorio EEF's SSL ha mandado una advertencia del/de los certificado(s) de HTTPS para este sitio:"> <!ENTITY ssl-observatory.warning.defense "Si has entrado a este sitio, es recomendable que cambies tu clave una vez que tengas una conexion segura. (Estas advertencias pueden ser desactivadas en la pestaña del "Observatorio SSL" del dialogo de preferencias para HTTPS en todos lados.) "> <!ENTITY ssl-observatory.prefs.self_signed

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 79105b55b79ac1846a25de69c28d9f4b0e0111d1 Merge: 62194caa0 93be7275e Author: teor <teor(a)torproject.org> Date: Fri Oct 25 10:55:47 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 8 ++++++-- changes/ticket31919_bionic | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Travis: Use Ubuntu Bionic, but keep Trusty for chutney
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 8e549dd5629da8ada48735c36dc97f23b3d192e1 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:31:05 2019 +1000 Travis: Use Ubuntu Bionic, but keep Trusty for chutney Bionic has a recent coccinelle version, which passes our CI tests. But Bionic (and Xenial) cause permissions errors for chutney. We'll fix those in 32240. Part of 31919. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d429e1537..1bb401690 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,10 @@ matrix: os: osx ## We run chutney on Linux, because it's faster than chutney on macOS - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## (Linux only) Use an older Linux image (Ubuntu Trusty) + ## The Xenial and Bionic images cause permissions issues for chutney, + ## this is a workaround, until we fix #32240. + dist: trusty ## We check asciidoc with distcheck, to make sure we remove doc products ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" @@ -58,8 +62,8 @@ matrix: - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx -## (Linux only) Use the latest Linux image (Ubuntu Trusty) -dist: trusty +## (Linux only) Use a recent Linux image (Ubuntu Bionic) +dist: bionic ## Download our dependencies addons:

1 0