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

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

05 Sep '18

commit 2b04163666ae22b4df81b868374bbd449614cc2b Merge: b390983b2 a7e72f0c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:16:06 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc .travis.yml index 6c088fd95,2368a38d0..ad633e46a --- a/.travis.yml +++ b/.travis.yml @@@ -171,8 -168,8 +171,8 @@@ install script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_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/maint-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/master] 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/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 2b04163666ae22b4df81b868374bbd449614cc2b Merge: b390983b2 a7e72f0c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:16:06 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc .travis.yml index 6c088fd95,2368a38d0..ad633e46a --- a/.travis.yml +++ b/.travis.yml @@@ -171,8 -168,8 +171,8 @@@ install script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_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/master] 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/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit a7e72f0c44f42145ff39c1ef77fb131c25569732 Merge: 67bdd144b 57b207efa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:15:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 06c14f920900f99935e0cf6072aeb50231464eba Merge: 75da2045c 2b0416366 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:16:11 2018 -0400 Merge branch 'maint-0.3.4' .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] 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] 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.2] 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