Merge branch 'maint-0.2.8'

diff --cc Makefile.am
index 3c802900a01a3c7e487f73f61115917ad8df2879,cd882642649c739865c4f211b8b27e1575784c2e..13ba00d4b5d592af1cec94198df56507dfd7c73a
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -101,10 -101,10 +101,10 @@@ test-network: need-chutney-path $(TESTI
  # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
  # only run mixed tests if we have a tor-stable binary
  # see #17015 for autodetection of different tor versions
 -test-network-all: need-chutney-path all test-driver
 +test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert
        mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
        @flavors="$(TEST_CHUTNEY_FLAVORS)"; \
-       if ping6 -q -o ::1 >/dev/null 2>&1; then \
+       if ping6 -q -c 1 -o ::1 >/dev/null 2>&1; then \
                echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
                flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
        else \