Merge branch 'maint-0.3.2' into maint-0.3.3

This commit is contained in:
Nick Mathewson 2018-09-05 10:15:45 -04:00
commit a7e72f0c44
2 changed files with 4 additions and 1 deletions

View File

@ -169,7 +169,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

3
changes/bug27418 Normal file
View File

@ -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.