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

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 9a767f00be31985ed877e6086994e8405ec57356 Merge: 685232fe1 ff1486385 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:15:00 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Travis: don't call echo with a --flag as the first argument
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 35b0ac8d8419695f7b7e89d73355ba53b6d13204 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 13:30:17 2018 +1000 Travis: don't call echo with a --flag as the first argument When we use echo in Travis, don't pass a --flag as the first argument. Fixes bug 27418; bugfix on 0.3.4.7-rc. --- .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b8621007..e3edf54f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -134,7 +134,7 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi diff --git a/changes/bug27418 b/changes/bug27418 new file mode 100644 index 000000000..1d99497dc --- /dev/null +++ b/changes/bug27418 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - When we use echo in Travis, don't pass a --flag as the first argument. + Fixes bug 27418; bugfix on 0.3.4.7-rc.

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit ff1486385aed1172c18a8a593dec2684de891f60 Merge: 4e4b6a247 35b0ac8d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:14:56 2018 -0400 Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 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 05 Sep '18

05 Sep '18

commit 7aebf292d61c8af30c9460fbe2bb743d776f6db2 Merge: 39792f430 a7e72f0c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:15:45 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 57b207efa42e0a2794457cc7aff9c662d9000b44 Merge: 2b1b8bf2c ff1486385 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:15:42 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc .travis.yml index a64b5e61f,a323b4ecd..82eced41b --- a/.travis.yml +++ b/.travis.yml @@@ -169,8 -133,8 +169,8 @@@ install script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit ff1486385aed1172c18a8a593dec2684de891f60 Merge: 4e4b6a247 35b0ac8d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:14:56 2018 -0400 Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

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

05 Sep '18

commit 57b207efa42e0a2794457cc7aff9c662d9000b44 Merge: 2b1b8bf2c ff1486385 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:15:42 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc .travis.yml index a64b5e61f,a323b4ecd..82eced41b --- a/.travis.yml +++ b/.travis.yml @@@ -169,8 -133,8 +169,8 @@@ install script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 57b207efa42e0a2794457cc7aff9c662d9000b44 Merge: 2b1b8bf2c ff1486385 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:15:42 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc .travis.yml index a64b5e61f,a323b4ecd..82eced41b --- a/.travis.yml +++ b/.travis.yml @@@ -169,8 -133,8 +169,8 @@@ install script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit ff1486385aed1172c18a8a593dec2684de891f60 Merge: 4e4b6a247 35b0ac8d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:14:56 2018 -0400 Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Travis: don't call echo with a --flag as the first argument
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 35b0ac8d8419695f7b7e89d73355ba53b6d13204 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 13:30:17 2018 +1000 Travis: don't call echo with a --flag as the first argument When we use echo in Travis, don't pass a --flag as the first argument. Fixes bug 27418; bugfix on 0.3.4.7-rc. --- .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b8621007..e3edf54f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -134,7 +134,7 @@ install: script: - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi diff --git a/changes/bug27418 b/changes/bug27418 new file mode 100644 index 000000000..1d99497dc --- /dev/null +++ b/changes/bug27418 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - When we use echo in Travis, don't pass a --flag as the first argument. + Fixes bug 27418; bugfix on 0.3.4.7-rc.

1 0