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

[tor/release-0.3.3] Merge branch 'travis_distcheck_031' into travis_distcheck_033
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit d5d312884f7d8d9a0212b12e954270b8b9f72258 Merge: bf466f550 f32ac2aaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 18:37:59 2018 -0400 Merge branch 'travis_distcheck_031' into travis_distcheck_033 .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 5cc3a0379eba0eb4e9baac97468fcaebcc654437 Merge: e88863407 34e7dca9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 5 ++++- changes/travis_distcheck | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc .travis.yml index bf55b7756,6da3027b8..3f133782d --- a/.travis.yml +++ b/.travis.yml @@@ -96,9 -89,9 +96,11 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" + - compiler: gcc env: COVERAGE_OPTIONS="--enable-coverage" + - compiler: gcc + env: DISTCHECK="yes" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no

1 0

[tor/release-0.3.3] Merge branch 'travis_distcheck_033' into maint-0.3.3
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit d44753b0e8a710468171ad24a1be85c921923e76 Merge: 7e7b052b2 d5d312884 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:38:34 2018 -0400 Merge branch 'travis_distcheck_033' into maint-0.3.3 .travis.yml | 7 ++++++- changes/travis_distcheck | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 148540c505bfcdf6680df8fc20de5362b0666298 Merge: d8114a1f5 85cd8386f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 7 ++++++- changes/travis_distcheck | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'travis_distcheck_029' into travis_distcheck_031
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 96bc96ceeb8e30868bbb0c6493ea142dc23af34b Merge: ce8e7427b 612513371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 17:35:41 2018 -0400 Merge branch 'travis_distcheck_029' into travis_distcheck_031 .travis.yml | 5 ++++- changes/travis_distcheck | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc .travis.yml index bf55b7756,6da3027b8..3f133782d --- a/.travis.yml +++ b/.travis.yml @@@ -96,9 -89,9 +96,11 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" + - compiler: gcc env: COVERAGE_OPTIONS="--enable-coverage" + - compiler: gcc + env: DISTCHECK="yes" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no

1 0

[tor/release-0.3.3] Merge branch 'travis_distcheck_029' into travis_distcheck_033
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit bf466f55032f4c9f57e532d150cb30fb7d9fb00d Merge: 44aa586de 612513371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 18:34:28 2018 -0400 Merge branch 'travis_distcheck_029' into travis_distcheck_033 .travis.yml | 5 ++++- changes/travis_distcheck | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc .travis.yml index 3d61f5a61,6da3027b8..d4587ca9f --- a/.travis.yml +++ b/.travis.yml @@@ -97,11 -89,9 +97,13 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - compiler: gcc + env: RUST_OPTIONS="" + - compiler: gcc env: COVERAGE_OPTIONS="--enable-coverage" + - compiler: gcc + env: DISTCHECK="yes" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no

1 0

[tor/release-0.3.3] Test the with-rust and without-rust distcheck variants
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit f32ac2aaf5a3ae420cf4dae0081418664e048206 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 17:36:35 2018 -0400 Test the with-rust and without-rust distcheck variants --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f133782d..1d0085958 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,9 @@ matrix: - compiler: gcc env: COVERAGE_OPTIONS="--enable-coverage" - compiler: gcc - env: DISTCHECK="yes" + env: DISTCHECK="yes" RUST_OPTIONS="" + - compiler: gcc + env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no

1 0

[tor/release-0.3.3] Merge branch 'travis_distcheck_029' into maint-0.2.9
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 34e7dca9c9e902a58fe8942cef666f1d99d06030 Merge: 9727b4c5d 612513371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:38:19 2018 -0400 Merge branch 'travis_distcheck_029' into maint-0.2.9 .travis.yml | 5 ++++- changes/travis_distcheck | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 85cd8386fa7da82d453bfb31b39184fbd8d96e08 Merge: d44753b0e 89a3fafd4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 89a3fafd49c046c3cd1c9c34f7db4798272f9ffb Merge: 9187cdb1c 5cc3a0379 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 5 ++++- changes/travis_distcheck | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)

1 0