diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-09 11:51:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-09 11:51:18 -0400 |
| commit | 59f3cce0dcddb98301d18d0cb4cb08c1619fa34c (patch) | |
| tree | 988f823cc734aaaaf08c8fb0b40f372b4c66f4ff /src/or/dirvote.h | |
| parent | 4af88d68b4905beac168adb5f1756d610ff7ed7e (diff) | |
| parent | 607724c696a6e1bb10c8a955dac38f0ea947ce34 (diff) | |
| download | tor-59f3cce0dcddb98301d18d0cb4cb08c1619fa34c.tar.gz tor-59f3cce0dcddb98301d18d0cb4cb08c1619fa34c.zip | |
Merge branch 'bug12899_squashed'
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 5eecc91d69..b27ce01e30 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -100,7 +100,7 @@ const cached_dir_t *dirvote_get_vote(const char *fp, int flags); void set_routerstatus_from_routerinfo(routerstatus_t *rs, node_t *node, routerinfo_t *ri, time_t now, - int naming, int listbadexits, + int listbadexits, int listbaddirs, int vote_on_hsdirs); networkstatus_t * dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, |