[tor-commits] [tor/maint-0.2.4] Rephrase comment in trusted_dirs_load_certs_from_string() to reflect 5595 fix

[andrea at torproject.org]

commit ac73ceb72858da1b77406988036b15362111b8a1
Author: Andrea Shepard <andrea at torproject.org>
Date:   Thu May 9 09:41:50 2013 -0700

    Rephrase comment in trusted_dirs_load_certs_from_string() to reflect 5595 fix
---
 src/or/routerlist.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 14c44ec..aa1660f 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,