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

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 7a53e3552cb8fef7dfd0ed2670991fca72a2d4ba Merge: 3a088d43f 190386f1c Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Fix gcc build exclude on travis
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 190386f1c44462fbef568ca9e3c1c997dbebcf12 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 20 05:03:58 2019 +0200 Fix gcc build exclude on travis The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't, either. Reduces the number of builders by one. --- .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 428c6a000..ef2e41998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ matrix: - compiler: gcc os: linux ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty diff --git a/changes/bug31463 b/changes/bug31463 new file mode 100644 index 000000000..d85c0887c --- /dev/null +++ b/changes/bug31463 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463; + bugfix on 0.3.5.4-alpha.

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 357e9a6f2c88b99e85e65c0401c524adbe921665 Merge: 90f4ed233 190386f1c Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 5a73f369dbd4d19ced536f4862b12ef98d6a2002 Merge: 7c92f4faa 357e9a6f2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 357e9a6f2c88b99e85e65c0401c524adbe921665 Merge: 90f4ed233 190386f1c Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Fix gcc build exclude on travis
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 190386f1c44462fbef568ca9e3c1c997dbebcf12 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 20 05:03:58 2019 +0200 Fix gcc build exclude on travis The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't, either. Reduces the number of builders by one. --- .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 428c6a000..ef2e41998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ matrix: - compiler: gcc os: linux ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty diff --git a/changes/bug31463 b/changes/bug31463 new file mode 100644 index 000000000..d85c0887c --- /dev/null +++ b/changes/bug31463 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463; + bugfix on 0.3.5.4-alpha.

1 0

[tor/maint-0.3.5] Fix gcc build exclude on travis
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 190386f1c44462fbef568ca9e3c1c997dbebcf12 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 20 05:03:58 2019 +0200 Fix gcc build exclude on travis The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't, either. Reduces the number of builders by one. --- .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 428c6a000..ef2e41998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ matrix: - compiler: gcc os: linux ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty diff --git a/changes/bug31463 b/changes/bug31463 new file mode 100644 index 000000000..d85c0887c --- /dev/null +++ b/changes/bug31463 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463; + bugfix on 0.3.5.4-alpha.

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 357e9a6f2c88b99e85e65c0401c524adbe921665 Merge: 90f4ed233 190386f1c Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 35e978da61efa04af9a5ab2399dff863bc6fb20a Merge: 78e084a12 5a73f369d Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.4.1'

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 5a73f369dbd4d19ced536f4862b12ef98d6a2002 Merge: 7c92f4faa 357e9a6f2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0