summaryrefslogtreecommitdiff
path: root/src/or/dirvote.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-18 13:16:49 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-18 13:16:49 -0500
commitc4fb7ad0348a190be8496b429aa96982f1b26917 (patch)
tree5898237d9b67e5669448b8265ae1415fc1c19aab /src/or/dirvote.h
parent14c9b9905180a21b8aa648b642ff5d3f7d86e29f (diff)
parentea6f88478cec6b3151a992cf2fd99539997ebb94 (diff)
downloadtor-c4fb7ad0348a190be8496b429aa96982f1b26917.tar.gz
tor-c4fb7ad0348a190be8496b429aa96982f1b26917.zip
Merge branch 'feature12538_028_01_squashed'
Diffstat (limited to 'src/or/dirvote.h')
-rw-r--r--src/or/dirvote.h1
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