summaryrefslogtreecommitdiff
path: root/changes/bug9671_023
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-09-04 16:04:47 -0400
committerNick Mathewson <nickm@torproject.org>2013-09-04 16:04:47 -0400
commit3cebc5e73c2db10bbe2c2259e3f4dd1c57d39afa (patch)
tree27223037f82a6610c2119ba47f85768d001758d4 /changes/bug9671_023
parent8611195a005ed1624bdea0632404a8c00bb19586 (diff)
parent4f3dbb3c0a5c1a6d7d8571add3722e6c567e3d81 (diff)
downloadtor-3cebc5e73c2db10bbe2c2259e3f4dd1c57d39afa.tar.gz
tor-3cebc5e73c2db10bbe2c2259e3f4dd1c57d39afa.zip
Merge branch 'bug9671_023' into maint-0.2.3
Diffstat (limited to 'changes/bug9671_023')
-rw-r--r--changes/bug9671_0235
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug9671_023 b/changes/bug9671_023
new file mode 100644
index 0000000000..035ca5cdea
--- /dev/null
+++ b/changes/bug9671_023
@@ -0,0 +1,5 @@
+ o Major bugfixes:
+ - If the circuit build timeout logic is disabled (via the consensus,
+ or because we are an authority), then don't build testing circuits.
+ Fixes bug 9657; bugfix on 0.2.2.14-alpha.
+