diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:45:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:45:49 -0400 |
| commit | aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783 (patch) | |
| tree | abdcfdbf4b0b8702a2962d547d9daf0dcf87da8c /src | |
| parent | 0b827cbcb11abece686d402170bd58724a77e365 (diff) | |
| parent | 5d2b2b9ede6ea0f247b5505d7e30a622c312e9fe (diff) | |
| download | tor-aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783.tar.gz tor-aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783.zip | |
Merge remote-tracking branch 'public/bug6164' into maint-0.2.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/dirserv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 5aed3fb6b1..8e8f79a171 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2434,9 +2434,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)) { |