diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-21 07:30:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-21 07:30:32 -0500 |
| commit | 62f97545e48758c39a5e6e7c4e7cd01073affae0 (patch) | |
| tree | 6620df2e6f0427403be7beb0ddca29e7d6218798 /src/or/dirvote.h | |
| parent | 079644b7918f9098b063547997a158fb80003713 (diff) | |
| parent | f0a4282e9af25e6c77e6b8a0e59c4aa34e75b9bc (diff) | |
| download | tor-62f97545e48758c39a5e6e7c4e7cd01073affae0.tar.gz tor-62f97545e48758c39a5e6e7c4e7cd01073affae0.zip | |
Merge remote-tracking branch 'public/bug12538_merged'
Diffstat (limited to 'src/or/dirvote.h')
| -rw-r--r-- | src/or/dirvote.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 966d163088..cc526ea34e 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -177,6 +177,7 @@ STATIC char *format_networkstatus_vote(crypto_pk_t *private_key, STATIC char *dirvote_compute_params(smartlist_t *votes, int method, int total_authorities); STATIC char *compute_consensus_package_lines(smartlist_t *votes); +STATIC char *make_consensus_method_list(int low, int high, const char *sep); #endif #endif |