From: Roger Dingledine <arma@torproject.org>
Date: Sun, 8 Jan 2012 17:17:16 +0000 (-0500)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.11-alpha~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecdea4eeafd921f0dcb053f2585d9cb05d6df658;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

ecdea4eeafd921f0dcb053f2585d9cb05d6df658
diff --cc src/or/networkstatus.c
index 7cd9d02c3f,d5637b2c93..a835e78b85
--- 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();