Merge branch 'maint-0.2.2'

diff --cc src/common/tortls.c
Simple merge

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

diff --cc src/or/dirvote.h
Simple merge

diff --cc src/or/networkstatus.c
index 7cd9d02c3f28c3b06964e1d91153c4a59e592148,d5637b2c93d106966ca9f0b322bcf832f5d71f94..a835e78b85b33996dcf6ddb75633c7e01e404efb
--- 1/src/or/networkstatus.c
--- 2/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();

diff --cc src/test/test_dir.c
Simple merge