summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-02 09:15:16 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-02 09:15:16 -0400
commit569368e5a9a7f418caee513bfd4d4b4dfce9d032 (patch)
tree83a35689f1b6f6a85874b443c34f205c2349f034 /changes
parentf273295cadd1afe03c0e839ce51f0d00bf2b43d6 (diff)
parent5cde98e882408854bf9f0a3bb3c0995d1f7317af (diff)
downloadtor-569368e5a9a7f418caee513bfd4d4b4dfce9d032.tar.gz
tor-569368e5a9a7f418caee513bfd4d4b4dfce9d032.zip
Merge remote-tracking branch 'teor/master'
Diffstat (limited to 'changes')
-rw-r--r--changes/test-network-bridges-hs6
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/test-network-bridges-hs b/changes/test-network-bridges-hs
new file mode 100644
index 0000000000..a8f3521f3a
--- /dev/null
+++ b/changes/test-network-bridges-hs
@@ -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".