commit 174cbff8cf855dc1bbf690694f539ba3f85a508c Merge: 6b670d6 4ba9f3e Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 7 11:14:04 2011 -0400

Merge remote-tracking branch 'public/bug3153'

Conflicts: src/or/nodelist.c

changes/bug3153 | 5 +++++ src/or/microdesc.c | 41 ++++++++++++++++++++++++++++++++++++++++- src/or/nodelist.c | 18 ++++++++++++++++-- src/or/or.h | 5 +++++ 4 files changed, 66 insertions(+), 3 deletions(-)

diff --cc src/or/nodelist.c index 96b65a1,29bd7e0..0813121 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@@ -183,9 -187,13 +187,13 @@@ nodelist_set_consensus(networkstatus_t node->rs = rs; if (ns->flavor == FLAV_MICRODESC) { if (node->md == NULL || - 0!=memcmp(node->md->digest,rs->descriptor_digest,DIGEST256_LEN)) { + tor_memneq(node->md->digest,rs->descriptor_digest,DIGEST256_LEN)) { + if (node->md) + node->md->held_by_node = 0; node->md = microdesc_cache_lookup_by_digest256(NULL, rs->descriptor_digest); + if (node->md) + node->md->held_by_node = 1; } }