diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:15:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:15:00 -0400 |
| commit | 9a767f00be31985ed877e6086994e8405ec57356 (patch) | |
| tree | 58494545e54c29e45febc634ab49c14b402fa2f6 | |
| parent | 685232fe1445d94b64c4e74864406f9c77a8592f (diff) | |
| parent | ff1486385aed1172c18a8a593dec2684de891f60 (diff) | |
| download | tor-9a767f00be31985ed877e6086994e8405ec57356.tar.gz tor-9a767f00be31985ed877e6086994e8405ec57356.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | changes/bug27418 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 5b0c4baf59..a323b4ecd4 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 0000000000..1d99497dc4 --- /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. |