diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 12:33:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 12:33:54 -0400 |
| commit | 4b57ec6e5eabb822506416bc5cf0e291ff9c0053 (patch) | |
| tree | 2c1621d0f477f1929a94faa74d5ad1401fc6c519 /changes/bug1297a | |
| parent | 6917728637bdbaed86d48d394eab6a063c319269 (diff) | |
| parent | 16cfca501ff27dd11daa9dc75ba9f5d99c48bdf5 (diff) | |
| download | tor-4b57ec6e5eabb822506416bc5cf0e291ff9c0053.tar.gz tor-4b57ec6e5eabb822506416bc5cf0e291ff9c0053.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/circuituse.c
Diffstat (limited to 'changes/bug1297a')
| -rw-r--r-- | changes/bug1297a | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/changes/bug1297a b/changes/bug1297a new file mode 100644 index 0000000000..140b94e3b0 --- /dev/null +++ b/changes/bug1297a @@ -0,0 +1,16 @@ + o Major bugfixes: + - Apply circuit timeouts to opened hidden-service-related circuits + based on the correct start time. Previously, we would apply the + circuit build timeout based on time since the circuit's + creation; it was supposed to be applied based on time since the + circuit entered its current state. Bugfix on 0.0.6; fixes part + of bug 1297. + - Use the same circuit timeout for client-side introduction + circuits as for other four-hop circuits. Previously, + client-side introduction circuits were closed after the same + timeout as single-hop directory-fetch circuits; this was + appropriate with the static circuit build timeout in 0.2.1.x and + earlier, but caused many hidden service access attempts to fail + with the adaptive CBT introduced in 0.2.2.2-alpha. Bugfix on + 0.2.2.2-alpha; fixes another part of bug 1297. + |