diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
| commit | 41eef6680e814f453cc8eedff415e941429aa627 (patch) | |
| tree | 7d2ac796e36d7c5786289a6093a98c66c36dbaad /src/or/dirvote.h | |
| parent | c6ea014b5978a020ca4472345216ba29584db5a9 (diff) | |
| parent | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (diff) | |
| download | tor-41eef6680e814f453cc8eedff415e941429aa627.tar.gz tor-41eef6680e814f453cc8eedff415e941429aa627.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/dirserv.c
src/or/networkstatus.c
Conflicts were related to routerinfo->node shift.
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 b6746c6557..d19635173f 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -63,7 +63,7 @@ void set_routerstatus_from_routerinfo(routerstatus_t *rs, node_t *node, 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, |