summaryrefslogtreecommitdiff
path: root/changes/bug6304
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-04-11 01:29:24 -0400
committerRoger Dingledine <arma@torproject.org>2013-04-11 01:29:24 -0400
commit887eba98950f2974bd2031510e1ece2279a4f106 (patch)
tree0bda88092333a1aa21925033596f395df4e3d4b1 /changes/bug6304
parentfcd9248387249d68619734a73860ffaab12b021b (diff)
parent6acf0ac2851fb95953edea9c231d82f487f28c3d (diff)
downloadtor-887eba98950f2974bd2031510e1ece2279a4f106.tar.gz
tor-887eba98950f2974bd2031510e1ece2279a4f106.zip
Merge branch 'maint-0.2.4' into release-0.2.4
Diffstat (limited to 'changes/bug6304')
-rw-r--r--changes/bug63044
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug6304 b/changes/bug6304
new file mode 100644
index 0000000000..445560a8e1
--- /dev/null
+++ b/changes/bug6304
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Behave correctly when the user disables LearnCircuitBuildTimeout
+ but doesn't tell us what they would like the timeout to be. Fixes
+ bug 6304; bugfix on 0.2.2.14-alpha.