summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2013-05-09 09:41:50 -0700
committerAndrea Shepard <andrea@torproject.org>2013-05-09 10:55:07 -0700
commitac73ceb72858da1b77406988036b15362111b8a1 (patch)
tree71fc6b1e79806eabf6b7ca0690b62a04cc0c749b
parent17692b2fe2f9fd7c33461c981b8d2eb511976758 (diff)
downloadtor-ac73ceb72858da1b77406988036b15362111b8a1.tar.gz
tor-ac73ceb72858da1b77406988036b15362111b8a1.zip
Rephrase comment in trusted_dirs_load_certs_from_string() to reflect 5595 fix
-rw-r--r--src/or/routerlist.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 14c44ec913..aa1660f301 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -309,9 +309,13 @@ trusted_dirs_load_certs_from_string(const char *contents, int source,
from_store ? "cached" : "downloaded",
ds ? ds->nickname : "an old or new authority");
- /* a duplicate on a download should be treated as a failure, since it
- * probably means we wanted a different secret key or we are trying to
- * replace an expired cert that has not in fact been updated. */
+ /*
+ * A duplicate on download should be treated as a failure, so we call
+ * authority_cert_dl_failed() to reset the download status to make sure
+ * we can't try again. Since we've implemented the fp-sk mechanism
+ * to download certs by signing key, this should be much rarer than it
+ * was and is perhaps cause for concern.
+ */
if (!from_store) {
if (authdir_mode(get_options())) {
log_warn(LD_DIR,