summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-07-17 09:50:18 -0400
committerNick Mathewson <nickm@torproject.org>2012-07-17 09:50:18 -0400
commit0b6fb5ebcdccd7267e60caf5418b31977c41f12c (patch)
tree4106b6dc82df828427772b587e1797dade3e2388 /changes
parent7ac8a4a037581ab7c47079cc98c9d3496932a8bd (diff)
parent21c6c8485367ce66ab0791c153177c17bccd25c5 (diff)
downloadtor-0b6fb5ebcdccd7267e60caf5418b31977c41f12c.tar.gz
tor-0b6fb5ebcdccd7267e60caf5418b31977c41f12c.zip
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug63774
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug6377 b/changes/bug6377
new file mode 100644
index 0000000000..a3a3672783
--- /dev/null
+++ b/changes/bug6377
@@ -0,0 +1,4 @@
+ o Testing:
+ - Make it possible to set the TestingTorNetwork configuration
+ option using AlternateDirAuthority and AlternateBridgeAuthority
+ as an alternative to setting DirServer.