diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-01-19 16:26:26 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-01-19 16:26:26 -0500 |
| commit | f870f9c8bcdbf2f8fd1c1e1feb9f88dc111ab25a (patch) | |
| tree | 1725d467f118be34c702ec94c041ca8b6d788f35 /src/or/rendservice.c | |
| parent | 44388757c44834d63614c4e13cf88931992afc2a (diff) | |
| parent | f98f7ca89865d1a477fc65165b92c86b9d8437fa (diff) | |
| download | tor-f870f9c8bcdbf2f8fd1c1e1feb9f88dc111ab25a.tar.gz tor-f870f9c8bcdbf2f8fd1c1e1feb9f88dc111ab25a.zip | |
Merge branch 'bug24895_031_02' into bug24895_032_02
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 2cdafa6666..2c5c5840a1 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); |