Merge remote-tracking branch 'teor/master'

This commit is contained in:
Nick Mathewson
2015-09-02 09:15:16 -04:00
2 changed files with 15 additions and 1 deletions
+6
View File
@@ -0,0 +1,6 @@
o Minor features (testing, bridges, hidden services):
- Make "bridges+hs" the default test network. This tests almost all
tor functionality during make test-network, while allowing tests
to succeed on non-IPv6 systems.
Requires chutney commit 396da92 in test-network-bridges-hs.
Closes tickets 16945 (tor), 16946 (chutney) . Patches by "teor".