diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:16:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:16:06 -0400 |
| commit | 2b04163666ae22b4df81b868374bbd449614cc2b (patch) | |
| tree | 4f0d6f5ad7dce7b028a7473844f799d2aa8b545b | |
| parent | b390983b27df728564905b3c052c3d68ace8bea0 (diff) | |
| parent | a7e72f0c44f42145ff39c1ef77fb131c25569732 (diff) | |
| download | tor-2b04163666ae22b4df81b868374bbd449614cc2b.tar.gz tor-2b04163666ae22b4df81b868374bbd449614cc2b.zip | |
Merge branch 'maint-0.3.3' into maint-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. |