diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-03 14:35:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-03 14:35:03 -0400 |
| commit | 40487b0141096ddb40bec38f7d1c6a4367d8c279 (patch) | |
| tree | 7f38806dd0624f5f4cfbef673cc6f911f3769ce2 /src/or/rendservice.c | |
| parent | df2615d43da4578b7fb68eb753cc1c0d943642af (diff) | |
| parent | 70b9e79700f85ac07b931a2c836b4d63d0ba70c1 (diff) | |
| download | tor-40487b0141096ddb40bec38f7d1c6a4367d8c279.tar.gz tor-40487b0141096ddb40bec38f7d1c6a4367d8c279.zip | |
Merge remote-tracking branch 'dgoulet/bug20376_030_01'
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 305beb1e0b..959c0c6f13 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3066,8 +3066,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) log_info(LD_GENERAL, "Couldn't send introduction request for service %s on circuit %u", serviceid, (unsigned)circuit->base_.n_circ_id); - reason = END_CIRC_REASON_INTERNAL; - goto err; + goto done; } /* We've attempted to use this circuit */ @@ -3229,8 +3228,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) buf, REND_COOKIE_LEN+DH_KEY_LEN+DIGEST_LEN, circuit->cpath->prev)<0) { log_warn(LD_GENERAL, "Couldn't send RENDEZVOUS1 cell."); - reason = END_CIRC_REASON_INTERNAL; - goto err; + goto done; } crypto_dh_free(hop->rend_dh_handshake_state); |