aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-05-01 12:34:59 -0400
committerNick Mathewson <nickm@torproject.org>2014-05-01 12:34:59 -0400
commita2b59dba71687b28546ccc99e98f1a6675ccdc91 (patch)
tree9d844ebdea6c2ac26e0d4692b79226adde25fee3 /src
parent0e20825bf22bbe86dbd2a2822864b90ccc45c00b (diff)
parenta787575b7f2d9bbb8385940977cafcfc87c71234 (diff)
downloadtor-a2b59dba71687b28546ccc99e98f1a6675ccdc91.tar
tor-a2b59dba71687b28546ccc99e98f1a6675ccdc91.tar.gz
Merge branch 'bug11654_squashed'
Diffstat (limited to 'src')
-rw-r--r--src/or/nodelist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index a38a6d499..09232f9f9 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1510,8 +1510,8 @@ update_router_have_minimum_dir_info(void)
}
if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) {
- log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg);
- strlcpy(dir_info_status, "%s", sizeof(dir_info_status));
+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg);
+ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status));
res = 0;
goto done;
}