Merge branch 'maint-0.3.3' into maint-0.3.4

diff --cc .travis.yml
index 6c088fd95cca34a09d4aedc13ac7b0604471e9d8,2368a38d01fbb3135bc9dd129d1a42b213291f23..ad633e46a0986ee4df54d0be844ba7f36ec7df03
--- 1/.travis.yml
--- 2/.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