diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-12 10:23:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-12 10:23:55 -0500 |
| commit | a87c697fb157f243bc48bba868a69a5182042822 (patch) | |
| tree | 0112391806a26a361fd63406f0805679da1538c2 /src/or/rendclient.c | |
| parent | 26e7e519dc72aba1f00b9f0179f58e10fafda3d2 (diff) | |
| parent | 5e4174f3b45d65999e97c32dcce0b86b056b5957 (diff) | |
| download | tor-a87c697fb157f243bc48bba868a69a5182042822.tar.gz tor-a87c697fb157f243bc48bba868a69a5182042822.zip | |
Merge remote-tracking branch 'public/bug13698_024_v1'
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 10d13a37bb..5e5a09e41f 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -370,8 +370,7 @@ rend_client_rendcirc_has_opened(origin_circuit_t *circ) } /** - * Called to close other intro circuits we launched in parallel - * due to timeout. + * Called to close other intro circuits we launched in parallel. */ static void rend_client_close_other_intros(const char *onion_address) @@ -388,7 +387,7 @@ rend_client_close_other_intros(const char *onion_address) log_info(LD_REND|LD_CIRC, "Closing introduction circuit %d that we " "built in parallel (Purpose %d).", oc->global_identifier, c->purpose); - circuit_mark_for_close(c, END_CIRC_REASON_TIMEOUT); + circuit_mark_for_close(c, END_CIRC_REASON_IP_NOW_REDUNDANT); } } } |