sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.3' into release-0.2.3

This commit is contained in:
Roger Dingledine 2012-09-04 20:15:58 -04:00
parent 0eaebaeb63 acfd487e7d
commit 5d672c1b71
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
changes/bug6743 Normal file
View File

@ -0,0 +1,9 @@
o Minor bugfixes:
- Allow one-hop directory fetching circuits the full "circuit build
timeout" period, rather than just half of it, before failing them
and marking the relay down. This fix should help reduce cases where
clients declare relays (or worse, bridges) unreachable because
the TLS handshake takes a few seconds to complete. Fixes bug 6743;
bugfix on 0.2.2.2-alpha, where we changed the timeout from a static
30 seconds.

2
src/or/circuituse.c
View File

@ -372,7 +372,7 @@ circuit_expire_building(void)
} while (0)
SET_CUTOFF(general_cutoff, circ_times.timeout_ms);
SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms / 2.0);
SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms);
SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (4/3.0));
SET_CUTOFF(cannibalize_cutoff, circ_times.timeout_ms / 2.0);
SET_CUTOFF(close_cutoff, circ_times.close_ms);