diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:16:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:16:10 -0400 |
| commit | 444fd57044c12f2f89d66940078b4c8397b55e8a (patch) | |
| tree | f8195086dd157ff1680a800848a5175067fbb41e | |
| parent | b1350d27977c0fa57c351a18e630a1e20fb70a08 (diff) | |
| parent | 2b04163666ae22b4df81b868374bbd449614cc2b (diff) | |
| download | tor-444fd57044c12f2f89d66940078b4c8397b55e8a.tar.gz tor-444fd57044c12f2f89d66940078b4c8397b55e8a.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -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 6c088fd95c..ad633e46a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -172,7 +172,7 @@ install: script: - ./autogen.sh - 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 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. |