diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:15:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:15:42 -0400 |
| commit | 57b207efa42e0a2794457cc7aff9c662d9000b44 (patch) | |
| tree | 5accee8de1870e9e705c719297cd25170f856621 | |
| parent | 2b1b8bf2cad4af304d38f88e38047dadddd7e0be (diff) | |
| parent | ff1486385aed1172c18a8a593dec2684de891f60 (diff) | |
| download | tor-57b207efa42e0a2794457cc7aff9c662d9000b44.tar.gz tor-57b207efa42e0a2794457cc7aff9c662d9000b44.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.2
| -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 a64b5e61f2..82eced41b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -170,7 +170,7 @@ install: script: - ./autogen.sh - 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 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. |