sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'public/bug6164' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2013-03-18 15:45:49 -04:00
parent 0b827cbcb1 5d2b2b9ede
commit aa4fcc4f13
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/dirserv.c
View File

@ -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)) {