commit 2b04163666ae22b4df81b868374bbd449614cc2b Merge: b390983b2 a7e72f0c4 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 10:16:06 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

.travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc .travis.yml index 6c088fd95,2368a38d0..ad633e46a --- a/.travis.yml +++ b/.travis.yml @@@ -171,8 -168,8 +171,8 @@@ install

script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - 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