diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:15:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-05 10:15:45 -0400 |
| commit | 56e81bdded495c34804555c6e0adeb799ac769b9 (patch) | |
| tree | 0e6e4986b1b365abcd6fb11673f37b21ae714e33 | |
| parent | b79a4483577c720efc165f9758a1c37d7af94ab4 (diff) | |
| parent | 57b207efa42e0a2794457cc7aff9c662d9000b44 (diff) | |
| download | tor-56e81bdded495c34804555c6e0adeb799ac769b9.tar.gz tor-56e81bdded495c34804555c6e0adeb799ac769b9.zip | |
Merge branch 'maint-0.3.2' into release-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. |