diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-19 16:30:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-19 16:30:53 -0500 |
| commit | df4d5ebb7dfaac49915d7ef775fcbf242e6c688b (patch) | |
| tree | c6ccb857cc9077dc00c7862be460ee8f49b942b3 /src/or/rendservice.c | |
| parent | fa6137a903ef984f64d89e984cf285bf5158e08f (diff) | |
| parent | 129456e22257d24c380bed0f9ebc9d68955a01df (diff) | |
| download | tor-df4d5ebb7dfaac49915d7ef775fcbf242e6c688b.tar.gz tor-df4d5ebb7dfaac49915d7ef775fcbf242e6c688b.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 06166d7cf3..52bd6683fd 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2042,7 +2042,8 @@ rend_service_receive_introduction(origin_circuit_t *circuit, /* Launch a circuit to the client's chosen rendezvous point. */ - for (i=0;i<MAX_REND_FAILURES;i++) { + int max_rend_failures=hs_get_service_max_rend_failures(); + for (i=0;i<max_rend_failures;i++) { int flags = CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_IS_INTERNAL; if (circ_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME; /* A Single Onion Service only uses a direct connection if its @@ -2938,7 +2939,6 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc) cpath_build_state_t *newstate, *oldstate; tor_assert(oldcirc->base_.purpose == CIRCUIT_PURPOSE_S_CONNECT_REND); - oldstate = oldcirc->build_state; tor_assert(oldstate); |