diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-11 12:20:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-11 12:20:20 -0500 |
| commit | ba2be81fc36ba6140247873799b747605fb07bd4 (patch) | |
| tree | bf63ac0c702babc4f467af10f4ae85620b3fb8e4 /src/or/rendclient.c | |
| parent | cae59b913f7daa154c6b1eb9083d1f582c8d2a1e (diff) | |
| parent | c213f277cde00b258b159446f8d975026194c034 (diff) | |
| download | tor-ba2be81fc36ba6140247873799b747605fb07bd4.tar.gz tor-ba2be81fc36ba6140247873799b747605fb07bd4.zip | |
Merge remote-tracking branch 'teor/feature17840-v11-merged-v2'
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index e812a06ce6..b822295832 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -1367,11 +1367,19 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, smartlist_del(usable_nodes, i); goto again; } +#ifdef ENABLE_TOR2WEB_MODE + new_extend_info = extend_info_from_node(node, options->Tor2webMode); +#else new_extend_info = extend_info_from_node(node, 0); +#endif if (!new_extend_info) { + const char *alternate_reason = ""; +#ifdef ENABLE_TOR2WEB_MODE + alternate_reason = ", or we cannot connect directly to it"; +#endif log_info(LD_REND, "We don't have a descriptor for the intro-point relay " - "'%s'; trying another.", - extend_info_describe(intro->extend_info)); + "'%s'%s; trying another.", + extend_info_describe(intro->extend_info), alternate_reason); smartlist_del(usable_nodes, i); goto again; } else { |