Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/or/networkstatus.c

diff --cc src/common/container.h
Simple merge

diff --cc src/or/dirvote.c
index dd156bd9d93ef0a76ac8cd0e268b4750f45e82bb,f1381988c90b72ae85234aa838194eaf211e2ec4..517dac5074a1143d16f61180ac2379e737b103ef
--- 1/src/or/dirvote.c
--- 2/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);

diff --cc src/or/routerlist.c
Simple merge