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

[tor/master] Merge branch 'bug32240_32242_035' into bug32240_32242_040
by teor＠torproject.org 20 Dec '19

20 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/master] Merge branch 'bug32240_32242_040' into bug32240_32242_041
by teor＠torproject.org 20 Dec '19

20 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/master] Merge branch 'bug32240_042' into bug32240_master
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit 86ca3194aac91d8558a0269e3ef341b07c2b1602 Merge: 5082eeba3 da404910a Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:17:02 2019 +1000 Merge branch 'bug32240_042' into bug32240_master .travis.yml | 7 +++---- changes/ticket32240 | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'bug32240_32242_041' into bug32240_32242_042
by teor＠torproject.org 20 Dec '19

20 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/master] Merge remote-tracking branch 'tor-github/pr/1606'
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit 7e17c24381495f6eaf648b56e5239a7954fbd4ef Merge: cd160291a 55b25ee6c Author: teor <teor(a)torproject.org> Date: Fri Dec 20 10:12:18 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1606' .travis.yml | 10 ++++------ changes/ticket32240 | 4 ++++ changes/ticket32242 | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'bug32240_32242_042' into bug32240_32242_master
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit 55b25ee6c632a603c3a83e83deee396868289be7 Merge: 86ca3194a 8b5c11fbf Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:25:38 2019 +1000 Merge branch 'bug32240_32242_042' into bug32240_32242_master Merge: * libzstd-dev from ticket32242_042 * coccinelle from master .travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --cc .travis.yml index f007838a9,368910f1f..ccd2107fd --- a/.travis.yml +++ b/.travis.yml @@@ -119,10 -117,7 +119,9 @@@ addons - libnss3-dev - libscrypt-dev - libseccomp-dev - ## zstd doesn't exist in Ubuntu Trusty - #- libzstd + - libzstd-dev + ## Optional build dependencies + - coccinelle - shellcheck ## Conditional build dependencies ## Always installed, so we don't need sudo

1 0

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

20 Dec '19

commit 5dbb607e9472ee7fb42091ae7dc0c7f2550c4425 Merge: 8b5c11fbf 723763787 Author: teor <teor(a)torproject.org> Date: Fri Dec 20 10:12:51 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

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

20 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/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit da1f76f1261a4238269ca93f5d338ac402c11e14 Merge: 7e17c2438 5dbb607e9 Author: teor <teor(a)torproject.org> Date: Fri Dec 20 10:12:59 2019 +1000 Merge branch 'maint-0.4.2'

1 0

[tor/master] Travis: Turn off Tor's Sandbox in Chutney jobs
by teor＠torproject.org 20 Dec '19

20 Dec '19

commit 704f3224a2058329f23f9567873e77215e441701 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 09:01:45 2019 +1000 Travis: Turn off Tor's Sandbox in Chutney jobs We need to set "Sandbox 0", until we fix sandbox errors that are triggered by Ubuntu Xenial and Bionic. See 32722. Part of 32240. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6004727b6..1d56d64d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,9 @@ env: - HARDENING_OPTIONS="--enable-expensive-hardening" ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" + ## 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