merge master

This commit is contained in:
breakwa11 2015-07-14 19:02:52 +08:00
parent 69d369268a
commit 469d9f7bfa
3 changed files with 34 additions and 28 deletions

View file

@ -69,7 +69,7 @@ if [ -f /proc/sys/net/ipv4/tcp_fastopen ] ; then
fi
run_test tests/test_large_file.sh
run_test tests/test_udp_src.sh
run_test tests/test_command.sh
coverage combine && coverage report --include=shadowsocks/*