[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[nickm at torproject.org]

commit 4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611
Merge: d29c2eb 00ff80e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 20:09:10 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
    
    Conflicts:
    	src/or/networkstatus.c

 src/common/container.h |    2 +-
 src/common/di_ops.h    |    1 +
 src/or/dirvote.c       |   10 ++++++----
 src/or/routerlist.c    |    9 +++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --cc src/or/dirvote.c
index dd156bd,f138198..517dac5
--- 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);