tor

commit 2b04163666ae22b4df81b868374bbd449614cc2b
parent b390983b27df728564905b3c052c3d68ace8bea0
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  5 Sep 2018 10:16:06 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
M
.travis.yml
 | 
2
+-
A
changes/bug27418
 | 
3
+++

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git 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
@@ -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.