- tor-commits - lists.torproject.org

[tor/maint-0.3.4] Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff Merge: 54e249e26 f0cd8f804 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:28:13 2019 +1000 Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9 .travis.yml | 8 +++++--- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.9] Handle errors from coveralls more gracefully.
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 20 15:44:06 2019 +0100 Handle errors from coveralls more gracefully. Since we have moved coveralls to the script target the entire build will now fail if coveralls fail. We handle it more gracefully by echo'ing the failure instead of doing a hard-failure. See: https://bugs.torproject.org/29036 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5319bbb89..336b67d29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,7 +156,7 @@ script: - if [[ "$DISTCHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi after_failure: ## configure will leave a log file with more details of config failures.

1 0

[tor/maint-0.2.9] Do not cache bogus results from classifying client ciphers
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 1710f4bbd6bb100901e7f601a1c0f96b51845f86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 4 11:24:55 2019 -0400 Do not cache bogus results from classifying client ciphers When classifying a client's selection of TLS ciphers, if the client ciphers are not yet available, do not cache the result. Previously, we had cached the unavailability of the cipher list and never looked again, which in turn led us to assume that the client only supported the ancient V1 link protocol. This, in turn, was causing Stem integration tests to stall in some cases. Fixes bug 30021; bugfix on 0.2.4.8-alpha. --- changes/bug30021 | 8 ++++++++ src/common/tortls.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug30021 b/changes/bug30021 new file mode 100644 index 000000000..2a887f3cf --- /dev/null +++ b/changes/bug30021 @@ -0,0 +1,8 @@ + o Minor bugfixes (TLS protocol, integration tests): + - When classifying a client's selection of TLS ciphers, if the client + ciphers are not yet available, do not cache the result. Previously, + we had cached the unavailability of the cipher list and never looked + again, which in turn led us to assume that the client only supported + the ancient V1 link protocol. This, in turn, was causing Stem + integration tests to stall in some cases. + Fixes bug 30021; bugfix on 0.2.4.8-alpha. diff --git a/src/common/tortls.c b/src/common/tortls.c index 1fbe3c663..f79969d0d 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1500,7 +1500,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl, smartlist_free(elts); } done: - if (tor_tls) + if (tor_tls && peer_ciphers) return tor_tls->client_cipher_list_type = res; return res;

1 0

[tor/maint-0.2.9] Makefile: delete all the gcov-related files in reset-gcov
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 13:49:27 2019 +1000 Makefile: delete all the gcov-related files in reset-gcov And fix a comment. See: https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files --- .travis.yml | 2 +- Makefile.am | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 336b67d29..456b5abc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -168,7 +168,7 @@ after_failure: - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi before_cache: - # Delete all .gcda files. + ## Delete all gcov files. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi notifications: diff --git a/Makefile.am b/Makefile.am index e4be3f26f..4b1687f92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,9 @@ test-full: need-stem-path need-chutney-path check test-network test-stem test-full-online: need-stem-path need-chutney-path check test-network test-stem-full reset-gcov: - rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda + rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \ + $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \ + $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov HTML_COVER_DIR=$(top_builddir)/coverage_html coverage-html: all

1 0

[tor/maint-0.2.9] changes: Use the first Tor version with CI coverage for the 29036 changes file
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit eb0bd18d6e344c574614d6d53e2f7cead92c3178 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 13:40:16 2019 +1000 changes: Use the first Tor version with CI coverage for the 29036 changes file Otherwise, "make check-changes" will complain when we backport the change. --- changes/bug29036 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug29036 b/changes/bug29036 index 4de02adfe..8b96c5c8f 100644 --- a/changes/bug29036 +++ b/changes/bug29036 @@ -1,5 +1,5 @@ o Minor bugfix (continuous integration): - Reset coverage state on disk after Travis CI has finished. This is being done to prevent future gcda file merge errors which causes the test suite - for the process subsystem to fail. Fixes bug 29036; bugfix on 0.4.0.1-alpha. - + for the process subsystem to fail. The process subsystem was introduced + in 0.4.0.1-alpha. Fixes bug 29036; bugfix on 0.2.9.15.

1 0

[tor/maint-0.2.9] Run `make reset-gcov` after the script target in Travis CI is done.
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 0267c453e2e0d474f742efa1da3ce698ea4af97d Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Mar 18 15:27:14 2019 +0100 Run `make reset-gcov` after the script target in Travis CI is done. This should ensure that GCDA files are never entering the cache of Travis CI. See: https://bugs.torproject.org/29036 --- .travis.yml | 8 +++++--- changes/bug29036 | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 939f4f4e9..5319bbb89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,6 +155,8 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi after_failure: ## configure will leave a log file with more details of config failures. @@ -165,9 +167,9 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi -after_success: - ## If this build was one that produced coverage, upload it. - - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi +before_cache: + # Delete all .gcda files. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi notifications: irc: diff --git a/changes/bug29036 b/changes/bug29036 new file mode 100644 index 000000000..4de02adfe --- /dev/null +++ b/changes/bug29036 @@ -0,0 +1,5 @@ + o Minor bugfix (continuous integration): + - Reset coverage state on disk after Travis CI has finished. This is being + done to prevent future gcda file merge errors which causes the test suite + for the process subsystem to fail. Fixes bug 29036; bugfix on 0.4.0.1-alpha. +

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff Merge: 54e249e26 f0cd8f804 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:28:13 2019 +1000 Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9 .travis.yml | 8 +++++--- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64 Merge: e1955a2c5 1710f4bbd Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:28:58 2019 +1000 Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9 changes/bug30021 | 8 ++++++++ src/common/tortls.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Makefile: actually, don't delete the gcno files
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit f0cd8f804f8152355993acf0493b22b668f500b2 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 12:56:29 2019 +1000 Makefile: actually, don't delete the gcno files We need to keep the gcno files, because they are created at compile time. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 4b1687f92..48d3df265 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,9 +148,9 @@ test-full: need-stem-path need-chutney-path check test-network test-stem test-full-online: need-stem-path need-chutney-path check test-network test-stem-full +# We can't delete the gcno files, because they are created when tor is compiled reset-gcov: rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \ - $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \ $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov HTML_COVER_DIR=$(top_builddir)/coverage_html

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 05 Apr '19

05 Apr '19

commit 0237c0deeee1a0054ddea1b39c07ecfd4aefd57e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 5 22:20:30 2019 +0000 Update translations for tpo-web --- contents+fr.po | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/contents+fr.po b/contents+fr.po index 11155d5c3..9d8e69ad4 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -254,6 +254,11 @@ msgid "" "been involved in Tor are united by a common belief: internet users should " "have private access to an uncensored web.**" msgstr "" +"**Tout comme les utilisateurs de Tor, les développeurs, chercheurs, et " +"bailleurs de fonds qui ont rendu Tor possible forment un groupe de personnes" +" riche de diversité. Cependant, toutes les personnes impliquées dans Tor " +"sont unies par une conviction commune : les utilisateurs d'Internet " +"devraient avoir un accès privé à un Web non censuré.**" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -265,6 +270,12 @@ msgid "" "that don't reveal who is talking to whom, even to someone monitoring the " "network." msgstr "" +"Dans les années 1990, le manque de sécurité sur Internet et son potentiel " +"d'utilisation pour le pistage et la surveillance étaient en train de devenir" +" évidents, et en 1995, David Goldschalg, Mike Reed et Paul Syverson au " +"United States Naval Research Laboratory (NRL) se sont demandé si il existait" +" une manière de créer des connections à Internet qui ne divulgueraient pas " +"qui parle avec qui, même à quelqu'un qui surveille le réseau." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -272,6 +283,8 @@ msgid "" "Their answer was to create and deploy the first research designs and " "prototypes of onion routing." msgstr "" +"Leur réponse a été de créer et de déployer les premiers modèles de recherche" +" et les premiers prototypes de routage en oignon." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -280,11 +293,17 @@ msgid "" " privacy as possible, and the idea was to route traffic through multiple " "servers and encrypt it each step of the way." msgstr "" +"L'objectif du routage en oignon était d'obtenir une façon d'utiliser " +"Internet avec la meilleure protection des renseignements personnels " +"possible, et l'idée était d'acheminer le trafic en passant par plusieurs " +"serveurs et de le chiffrer à chaque étape du parcours." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "This is still a simple explanation for how Tor works today." msgstr "" +"Il s'agit aujourd'hui encore d'une explication simple du fonctionnement de " +"Tor." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -293,6 +312,10 @@ msgid "" "Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL " "onion routing project with Paul Syverson." msgstr "" +"Au début des années 2000, Roger Dingledine, un nouveau diplômé du " +"[Massachusetts Institute of Technology (MIT)](https://web.mit.edu/) a " +"commencé à travailler sur un projet de routage en oignon du NRL avec Paul " +"Syverson." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -302,6 +325,10 @@ msgid "" "stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, " "joined the project soon after." msgstr "" +"Afin de distinguer ce travail original du NRL des autres efforts de routage " +"en oignon qui commençaient à apparaître, Roger a nommé ce projet Tor, pour " +"\"The Onion Routing\". Nick Mathewson, un camarade de classe de Roger au " +"MIT, a rejoint le projet peu de temps après." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body)

1 0