diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-04 18:33:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-04 18:33:56 -0400 |
| commit | acfd487e7dbf5fa1408a2bba7afff54bc7d0118e (patch) | |
| tree | 87eb355154420ef5c7a5c87f4d96872fe529af20 | |
| parent | 4bd90e20b92fbe2b93fc53e24254f00e663d057e (diff) | |
| parent | eb3d0796677b5d37f27caf8b11d2a2e2c18e5674 (diff) | |
| download | tor-acfd487e7dbf5fa1408a2bba7afff54bc7d0118e.tar.gz tor-acfd487e7dbf5fa1408a2bba7afff54bc7d0118e.zip | |
Merge remote-tracking branch 'arma/bug6743' into 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 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); |