aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/or/directory.c2
-rw-r--r--src/or/routerlist.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 778632922..703cb55bc 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -670,6 +670,8 @@ directory_initiate_command(const char *address, uint32_t addr,
dir_port)) {
case -1:
connection_dir_request_failed(conn); /* retry if we want */
+ /* XXX we only pass 'conn' above, not 'resource', 'payload',
+ * etc. So in many situations it can't retry! -RD */
connection_free(TO_CONN(conn));
return;
case 1:
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 93369e157..4aedb64cc 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3911,7 +3911,8 @@ update_router_have_minimum_dir_info(void)
if (should_delay_dir_fetches(get_options())) {
log_notice(LD_DIR, "no known bridge descriptors running yet; stalling");
- strlcpy(dir_info_status, "No bridge descriptors.",sizeof(dir_info_status));
+ strlcpy(dir_info_status, "No live bridge descriptors.",
+ sizeof(dir_info_status));
res = 0;
goto done;
}