diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
| commit | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (patch) | |
| tree | 73b8f1ecac21bfad33f43c7759e5dfecf43361bc /src/or/dirvote.h | |
| parent | 5f9cdee8afd3fb0db835c19993fae476e0f00033 (diff) | |
| parent | f45261cb29504bfe39ddb96d8e7f38bb32dd37a5 (diff) | |
| download | tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.tar.gz tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.zip | |
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
Diffstat (limited to 'src/or/dirvote.h')
| -rw-r--r-- | src/or/dirvote.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 67540a37fb..de11fcf997 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -62,7 +62,7 @@ const cached_dir_t *dirvote_get_vote(const char *fp, int flags); void set_routerstatus_from_routerinfo(routerstatus_t *rs, routerinfo_t *ri, time_t now, int naming, int listbadexits, - int listbaddirs); + int listbaddirs, int vote_on_hsdirs); void router_clear_status_flags(routerinfo_t *ri); networkstatus_t * dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, |