aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-08 10:28:41 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-08 10:28:41 -0400
commit669fd05ed8cf7b90bb9e43dbbbbd35f40bf05fa0 (patch)
treea0f88ac2f0b80a8e6d510664aa8ff284054ab6eb /changes
parentedc9256e95e307092d57cf273ac699f33cb0192b (diff)
parent2bc82324d5051e5233a9332dd5958d5ca60c2931 (diff)
downloadtor-669fd05ed8cf7b90bb9e43dbbbbd35f40bf05fa0.tar
tor-669fd05ed8cf7b90bb9e43dbbbbd35f40bf05fa0.tar.gz
Merge remote branch 'origin/maint-0.2.1'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug18407
1 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug1840 b/changes/bug1840
new file mode 100644
index 000000000..0ef2b98a3
--- /dev/null
+++ b/changes/bug1840
@@ -0,0 +1,7 @@
+ o Minor bugfixes:
+ - Allow handshaking OR connections to take a full KeepalivePeriod
+ seconds to handshake. Previously, we would close them after
+ IDLE_OR_CONN_TIMEOUT seconds, as if they were open. This is a
+ bugfix on 0.2.1.26. Thanks to mingw-san for analysis help. Fixes
+ bug 1840.
+