summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-04-28 10:37:35 -0700
committerNick Mathewson <nickm@torproject.org>2011-04-28 15:52:42 -0400
commit2c0258b69a232a7b11ecc999bee74dac1c1b1495 (patch)
tree96663e396bc498a6633d63809ee0f4570bcd6799
parent4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d (diff)
downloadtor-2c0258b69a232a7b11ecc999bee74dac1c1b1495.tar.gz
tor-2c0258b69a232a7b11ecc999bee74dac1c1b1495.zip
Clean up merge of bug3k_021
-rw-r--r--src/or/rendclient.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 97345bf6a4..88038755e4 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -94,7 +94,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
log_info(LD_REND,
"query %s didn't have valid rend desc in cache. "
"Refetching descriptor.",
- safe_str(introcirc->rend_data->onion_address));
+ safe_str_client(introcirc->rend_data->onion_address));
rend_client_refetch_v2_renddesc(introcirc->rend_data);
{
connection_t *conn;
@@ -120,8 +120,9 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
}
});
if (!intro_key) {
- log_info(LD_REND, "Internal error: could not find intro key; we "
- "only have a v2 rend desc with %d intro points.",
+ log_info(LD_REND, "Our introduction point knowledge changed in "
+ "mid-connect! Could not find intro key; we only have a "
+ "v2 rend desc with %d intro points. Giving up.",
smartlist_len(entry->parsed->intro_nodes));
goto perm_err;
}