commit ecdea4eeafd921f0dcb053f2585d9cb05d6df658 Merge: 59d0a5a cc1580d Author: Roger Dingledine arma@torproject.org Date: Sun Jan 8 12:17:16 2012 -0500

Merge branch 'maint-0.2.2'

src/common/tortls.c | 5 +++++ src/or/dirvote.c | 22 ++++++++++++++++++---- src/or/dirvote.h | 2 ++ src/or/networkstatus.c | 25 ++++++++++++++++++------- src/test/test_dir.c | 12 ++++++++---- 5 files changed, 51 insertions(+), 15 deletions(-)

diff --cc src/or/networkstatus.c index 7cd9d02,d5637b2..a835e78 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -484,8 -469,10 +484,10 @@@ networkstatus_check_consensus_signature int n_bad = 0; int n_unknown = 0; int n_no_signature = 0; - int n_v3_authorities = get_n_authorities(V3_AUTHORITY); + int n_v3_authorities = get_n_authorities(V3_DIRINFO); int n_required = n_v3_authorities/2 + 1; + smartlist_t *list_good = smartlist_create(); + smartlist_t *list_no_signature = smartlist_create(); smartlist_t *need_certs_from = smartlist_create(); smartlist_t *unrecognized = smartlist_create(); smartlist_t *missing_authorities = smartlist_create();