summaryrefslogtreecommitdiff
path: root/changes/bug5049
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-06-13 16:55:39 -0400
committerNick Mathewson <nickm@torproject.org>2012-06-13 16:55:39 -0400
commite3a6e01fe196fa1c1ae707065d515718795bc1d1 (patch)
tree62c628794bb13f76093496366acde0ab6def9251 /changes/bug5049
parent7826eef93e8a3b1f90198596bfd19b589f58cc88 (diff)
parent5b0977df3153a82c51fadbda68235805b5a5cd45 (diff)
downloadtor-e3a6e01fe196fa1c1ae707065d515718795bc1d1.tar.gz
tor-e3a6e01fe196fa1c1ae707065d515718795bc1d1.zip
Merge branch 'trac-5049-squashed'
Diffstat (limited to 'changes/bug5049')
-rw-r--r--changes/bug50494
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug5049 b/changes/bug5049
new file mode 100644
index 0000000000..677fd42869
--- /dev/null
+++ b/changes/bug5049
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Make sure circuitbuild.c checks LearnCircuitBuildTimeout in all the
+ right places and never depends on the consensus parameters or computes
+ adaptive timeouts when it is disabled.