From: Nick Mathewson Date: Mon, 16 May 2011 00:09:10 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 X-Git-Tag: tor-0.2.2.26-beta~11^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: src/or/networkstatus.c --- 4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611 diff --cc src/or/dirvote.c index dd156bd9d9,f1381988c9..517dac5074 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@@ -1765,11 -881,9 +1767,11 @@@ networkstatus_compute_consensus(smartli /* Figure out the most popular opinion of what the most recent * routerinfo and its contents are. */ - rs = compute_routerstatus_consensus(matching_descs); + memset(microdesc_digest, 0, sizeof(microdesc_digest)); + rs = compute_routerstatus_consensus(matching_descs, consensus_method, + microdesc_digest); /* Copy bits of that into rs_out. */ - tor_assert(fast_memeq(lowest_id, rs->status.identity_digest, DIGEST_LEN)); + tor_assert(fast_memeq(lowest_id, rs->status.identity_digest,DIGEST_LEN)); memcpy(rs_out.identity_digest, lowest_id, DIGEST_LEN); memcpy(rs_out.descriptor_digest, rs->status.descriptor_digest, DIGEST_LEN);