From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Feb 2013 21:23:58 +0000 (-0500)
Subject: Clear up a comment about when an assertion could fire
X-Git-Tag: tor-0.2.4.12-alpha~5^2~39^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d2b2b9ede6ea0f247b5505d7e30a622c312e9fe;p=thirdparty%2Ftor.git

Clear up a comment about when an assertion could fire

Resolves ticket 6164
---

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index badacd683d..49fee88a97 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2216,9 +2216,10 @@ routerstatus_format_entry(char *buf, size_t buf_len,
         return -1;
       }
 
-      /* This assert can fire for the control port, because
+      /* This assert could fire for the control port, because
        * it can request NS documents before all descriptors
-       * have been fetched. */
+       * have been fetched. Therefore, we only do this test when
+       * format != NS_CONTROL_PORT. */
       if (tor_memneq(desc->cache_info.signed_descriptor_digest,
             rs->descriptor_digest,
             DIGEST_LEN)) {