- tor-commits - lists.torproject.org

[tor/maint-0.3.4] 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.3.4] Merge branch 'bug29036-029' into bug29036-29962-034
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit ac28e56ccb402d640f5adde186a765265ce855c7 Merge: 6d057c56f 57e9fe2bb Author: teor <teor(a)torproject.org> Date: Mon Apr 1 14:07:58 2019 +1000 Merge branch 'bug29036-029' into bug29036-29962-034 .travis.yml | 8 +++++--- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.4] 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

[tor/maint-0.3.4] Travis: merge before_cache from 29036 and 29962
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 33be8d8295415491fc06bee47729e86d9efcd126 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 14:05:14 2019 +1000 Travis: merge before_cache from 29036 and 29962 And add some useful comments --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b2a1ffd7..ed805aac3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,10 @@ cache: ## cargo: true directories: - $HOME/.cargo - -before_cache: - - rm -rf $HOME/.cargo/registry + ## caching CARGO_TARGET_DIR actually slows down the build over time, + ## because old build products are never deleted. + ## where we point CARGO_TARGET_DIR in all our cargo invocations + #- $TRAVIS_BUILD_DIR/src/rust/target compiler: - gcc @@ -217,6 +218,9 @@ after_failure: before_cache: ## Delete all gcov files. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi + ## Delete the cargo registry before caching .cargo, because it's cheaper to + ## download the registry and throw it away, rather than caching it + - rm -rf $HOME/.cargo/registry notifications: irc:

1 0

[tor/maint-0.3.4] Merge branch 'bug29036-029' into bug29036-29962-034
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit a514e024769083908a35f28ac0df5f2e7b1137b8 Merge: 33be8d829 f0cd8f804 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 12:58:16 2019 +1000 Merge branch 'bug29036-029' into bug29036-29962-034 Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Add changes file
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 124990aa01c8151fad98a6979e5996d5fbb3f51a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 31 17:23:34 2019 +0300 Add changes file --- changes/ticket29962 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket29962 b/changes/ticket29962 new file mode 100644 index 000000000..e36cc0cf9 --- /dev/null +++ b/changes/ticket29962 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - On Travis Rust builds, cleanup Rust registry and refrain from caching + target/ directory to speed up builds. Resolves issue 29962.

1 0

[tor/maint-0.3.4] Cleanup cargo registry before each Rust-enabled build
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 0c6cfd9c652e4f5074151320ad31c32cc82818e9 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 31 16:58:32 2019 +0300 Cleanup cargo registry before each Rust-enabled build Also, refrain from caching target/. See: https://levans.fr/rust_travis_cache.html --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87780bb1a..4b2a1ffd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,9 @@ cache: ## cargo: true directories: - $HOME/.cargo - ## where we point CARGO_TARGET_DIR in all our cargo invocations - - $TRAVIS_BUILD_DIR/src/rust/target + +before_cache: + - rm -rf $HOME/.cargo/registry compiler: - gcc

1 0

[tor/maint-0.3.4] 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.3.4] 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.3.4] Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
by teor＠torproject.org 05 Apr '19

05 Apr '19

commit 102178e6d43ed990e972b2fbc4f611997c8943f0 Merge: 3cfcfbac4 a514e0247 Author: teor <teor(a)torproject.org> Date: Sat Apr 6 09:30:04 2019 +1000 Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4 .travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-)

1 0