diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-13 12:42:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-13 12:42:29 -0500 |
| commit | 01ac961ca1fc46efeec141ea275c6ea9971c3ee7 (patch) | |
| tree | 35f6176135d9bb52900ca0a285619b1fc407e110 /src/or/dirvote.c | |
| parent | 21b5d76aa57bec3f585634be84884ac8fbb2a10f (diff) | |
| parent | f742b33d85c0884fa5902d0d24a1232c9bd47dd8 (diff) | |
| download | tor-01ac961ca1fc46efeec141ea275c6ea9971c3ee7.tar.gz tor-01ac961ca1fc46efeec141ea275c6ea9971c3ee7.zip | |
Merge branch 'fallback_dirsource_v3'
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 836349375c..1b9af0f731 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2787,7 +2787,7 @@ dirvote_fetch_missing_votes(void) char *resource; SMARTLIST_FOREACH_BEGIN(router_get_trusted_dir_servers(), - trusted_dir_server_t *, ds) { + dir_server_t *, ds) { if (!(ds->type & V3_DIRINFO)) continue; if (!dirvote_get_vote(ds->v3_identity_digest, @@ -2905,7 +2905,7 @@ list_v3_auth_ids(void) smartlist_t *known_v3_keys = smartlist_new(); char *keys; SMARTLIST_FOREACH(router_get_trusted_dir_servers(), - trusted_dir_server_t *, ds, + dir_server_t *, ds, if ((ds->type & V3_DIRINFO) && !tor_digest_is_zero(ds->v3_identity_digest)) smartlist_add(known_v3_keys, @@ -2926,7 +2926,7 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out) { networkstatus_t *vote; networkstatus_voter_info_t *vi; - trusted_dir_server_t *ds; + dir_server_t *ds; pending_vote_t *pending_vote = NULL; const char *end_of_vote = NULL; int any_failed = 0; |