diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-09-04 20:15:58 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-09-04 20:15:58 -0400 |
| commit | 5d672c1b71a88818c8043277c60a225fa1ba6eda (patch) | |
| tree | 20cea126e1381ce2d75da28189c6391344da8fde | |
| parent | 0eaebaeb63daadd7be3d7accbdf4e8697dbe5b5c (diff) | |
| parent | acfd487e7dbf5fa1408a2bba7afff54bc7d0118e (diff) | |
| download | tor-5d672c1b71a88818c8043277c60a225fa1ba6eda.tar.gz tor-5d672c1b71a88818c8043277c60a225fa1ba6eda.zip | |
Merge branch 'maint-0.2.3' into release-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 0000000000..6ec78f853a --- /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 c34b698fa1..20f124eb4e 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); |