diff options
| author | Andrea Shepard <andrea@torproject.org> | 2013-05-10 19:39:48 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2013-05-10 19:39:48 -0700 |
| commit | aaa3a085db05c4d98b7c51b5ef16da166e7c7f0a (patch) | |
| tree | b5b7a62362aac37bcbf237548de19f467d88805b /src/or/dirvote.c | |
| parent | bae5dd6c8d4535360d471932b87431f54b515567 (diff) | |
| parent | 54f41d68e9e30ccd0ebd84a3f8e913ea9e923cfd (diff) | |
| download | tor-aaa3a085db05c4d98b7c51b5ef16da166e7c7f0a.tar.gz tor-aaa3a085db05c4d98b7c51b5ef16da166e7c7f0a.zip | |
Merge bug5595-v2-squashed into maint-0.2.4
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index b02434c892..0c386e604e 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2963,7 +2963,7 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out) /* Hey, it's a new cert! */ trusted_dirs_load_certs_from_string( vote->cert->cache_info.signed_descriptor_body, - 0 /* from_store */, 1 /*flush*/); + TRUSTED_DIRS_CERTS_SRC_FROM_VOTE, 1 /*flush*/); if (!authority_cert_get_by_digests(vote->cert->cache_info.identity_digest, vote->cert->signing_key_digest)) { log_warn(LD_BUG, "We added a cert, but still couldn't find it."); |