diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-09 18:14:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-09 18:14:54 -0400 |
| commit | 2c15a065973e25d62628d1339131e1cd1eefcc8a (patch) | |
| tree | 96419048b1ab9effac2ed6cf38850069f3096834 | |
| parent | 7fa11a92d59cea60403b918c4fa9cf3dab6aefb3 (diff) | |
| parent | 5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4 (diff) | |
| download | tor-2c15a065973e25d62628d1339131e1cd1eefcc8a.tar.gz tor-2c15a065973e25d62628d1339131e1cd1eefcc8a.zip | |
Merge branch 'maint-0.2.8'
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | changes/bug19008 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 3c802900a0..13ba00d4b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,7 +104,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert 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 \ diff --git a/changes/bug19008 b/changes/bug19008 new file mode 100644 index 0000000000..c51c98faa6 --- /dev/null +++ b/changes/bug19008 @@ -0,0 +1,3 @@ + o Major bugfixes (testing): + - Fix a bug that would block 'make test-network-all' on systems + where IPv6 packets were lost. Fixes bug 19008; bugfix on tor-0.2.7.3-rc. |