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

[tor/maint-0.4.2] Merge branch 'bug32240_32242_040' into bug32240_32242_041
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 84c4ede052bc642677d9f53f9802e6d69ca647df Merge: 4a34fd5b7 d96b35d66 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:23:41 2019 +1000 Merge branch 'bug32240_32242_040' into bug32240_32242_041 .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'bug32240_32242_041' into bug32240_32242_042
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 8b5c11fbf6a408147e61ce96812faebca1580c61 Merge: da404910a 84c4ede05 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:23:46 2019 +1000 Merge branch 'bug32240_32242_041' into bug32240_32242_042 .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'bug32240_041' into bug32240_042
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit da404910a7cb25c20baf3fbf5e7a6a056bdbe9df Merge: bd11fb109 4a34fd5b7 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:15:42 2019 +1000 Merge branch 'bug32240_041' into bug32240_042 Merge: * CHUTNEY_TOR_SANDBOX=0 from bug32240_041 * RUST_VERSION from maint-0.4.2 .travis.yml | 7 +++---- changes/ticket32240 | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --cc .travis.yml index 80c8611a4,8d68629ea..aee59ed26 --- a/.travis.yml +++ b/.travis.yml @@@ -29,8 -29,9 +29,11 @@@ env - HARDENING_OPTIONS="--enable-expensive-hardening" ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" + ## Our default rust version is the minimum supported version + - RUST_VERSION="1.31.0" + ## Turn off tor's sandbox in chutney, until we fix sandbox errors that are + ## triggered by Ubuntu Xenial and Bionic. See #32722. + - CHUTNEY_TOR_SANDBOX="0" matrix: ## This matrix entry is required, but it doesn't actually create any jobs -

1 0

[tor/maint-0.4.2] Merge branch 'bug32240_32242_035' into bug32240_32242_040
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit d96b35d6639b1c2f6a57f9d84007544c334c963b Merge: e2f78396f 0b3763612 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:22:52 2019 +1000 Merge branch 'bug32240_32242_035' into bug32240_32242_040 Merge: * libzstd-dev from ticket32242_035 * shellcheck from maint-0.4.0 .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --cc .travis.yml index 1d97e70f5,7f7e7a572..c491bab88 --- a/.travis.yml +++ b/.travis.yml @@@ -115,9 -115,7 +115,8 @@@ addons - libnss3-dev - libscrypt-dev - libseccomp-dev - ## zstd doesn't exist in Ubuntu Trusty - #- libzstd + - libzstd-dev + - shellcheck ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 72376378714fef727004830157da79be97821a60 Merge: ffccf6fc5 d96b35d66 Author: teor <teor(a)torproject.org> Date: Fri Dec 20 10:12:43 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 10 ++++------ changes/ticket32240 | 4 ++++ changes/ticket32242 | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8 Merge: 75096de4c 434248664 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:21:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035 .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'bug32240_035' into bug32240_040
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit e2f78396f400dff5b28f6fdf845a9bcf7a8d1b85 Merge: 748117298 75096de4c Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:14:32 2019 +1000 Merge branch 'bug32240_035' into bug32240_040 .travis.yml | 7 +++---- changes/ticket32240 | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.2] Travis: Use zstd in our Travis Linux builds
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 43424866496e6f7613ec652c798fec3b8b460c6d Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:35:24 2019 +1000 Travis: Use zstd in our Travis Linux builds Recent Ubuntu versions have zstd >= 1.1, which is an optional tor build dependency. Closes ticket 32242. --- .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f7e8e4be..79e232f0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,8 +103,7 @@ addons: - libnss3-dev - libscrypt-dev - libseccomp-dev - ## zstd doesn't exist in Ubuntu Trusty - #- libzstd + - libzstd-dev ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc diff --git a/changes/ticket32242 b/changes/ticket32242 new file mode 100644 index 000000000..d63d5a586 --- /dev/null +++ b/changes/ticket32242 @@ -0,0 +1,2 @@ + o Testing (continuous integration): + - Use zstd in our Travis Linux builds. Closes ticket 32242.

1 0

[tor/maint-0.4.1] Travis: Use zstd in our Travis Linux builds
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 43424866496e6f7613ec652c798fec3b8b460c6d Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:35:24 2019 +1000 Travis: Use zstd in our Travis Linux builds Recent Ubuntu versions have zstd >= 1.1, which is an optional tor build dependency. Closes ticket 32242. --- .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f7e8e4be..79e232f0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,8 +103,7 @@ addons: - libnss3-dev - libscrypt-dev - libseccomp-dev - ## zstd doesn't exist in Ubuntu Trusty - #- libzstd + - libzstd-dev ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc diff --git a/changes/ticket32242 b/changes/ticket32242 new file mode 100644 index 000000000..d63d5a586 --- /dev/null +++ b/changes/ticket32242 @@ -0,0 +1,2 @@ + o Testing (continuous integration): + - Use zstd in our Travis Linux builds. Closes ticket 32242.

1 0

[tor/maint-0.4.1] Merge branch 'bug32240_029' into bug32240_035
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 75096de4c7ade9d8e734017d46714378bf3ae94c Merge: 1cd20ff84 37b04aeed Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:09:16 2019 +1000 Merge branch 'bug32240_029' into bug32240_035 Merge * Chutney Trusty deletion in bug32240_029 * NSS addition in maint-0.3.5 .travis.yml | 7 +++---- changes/ticket32240 | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --cc .travis.yml index 98bb8cce8,a67b8b92f..6ed69f5fb --- a/.travis.yml +++ b/.travis.yml @@@ -41,18 -37,10 +44,14 @@@ matrix os: osx ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" - ## We run chutney on Linux, because it's faster than chutney on macOS + ## We check NSS ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" + - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" + ## We run chutney on Linux, because it's faster than chutney on macOS + ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + compiler: clang - ## (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"

1 0