diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-04 18:34:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-04 18:34:39 -0400 |
| commit | 4d87919ba649790a2a6c446d112dd2a8ad34862d (patch) | |
| tree | ad01a5365b8b92435391e17eb08698addde2b791 | |
| parent | d7a646edcfbceaab412bc1558ec83a3551c2c8a4 (diff) | |
| parent | acfd487e7dbf5fa1408a2bba7afff54bc7d0118e (diff) | |
| download | tor-4d87919ba649790a2a6c446d112dd2a8ad34862d.tar tor-4d87919ba649790a2a6c446d112dd2a8ad34862d.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
| -rw-r--r-- | changes/bug6743 | 9 | ||||
| -rw-r--r-- | src/or/circuituse.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/changes/bug6743 b/changes/bug6743 new file mode 100644 index 000000000..6ec78f853 --- /dev/null +++ b/changes/bug6743 @@ -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. + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index c34b698fa..20f124eb4 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -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); |