sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.7' into maint-0.2.8

This commit is contained in:
Nick Mathewson 2016-05-09 18:14:44 -04:00
parent 55cf1970bc 61c0bae4f2
commit 5cd5979132
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -104,7 +104,7 @@ test-network: need-chutney-path all
test-network-all: need-chutney-path all test-driver
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 \

3
changes/bug19008 Normal file
View File

@ -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.