diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-01-08 12:17:16 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-01-08 12:17:16 -0500 |
| commit | ecdea4eeafd921f0dcb053f2585d9cb05d6df658 (patch) | |
| tree | 928e863bccd8dd871eaf098bb77a2a1541510fad /src/or/dirvote.h | |
| parent | 59d0a5ae693efe9321e03302515d405094998e43 (diff) | |
| parent | cc1580dbe02f0f285fca65b7b388d99dbaf78f5c (diff) | |
| download | tor-ecdea4eeafd921f0dcb053f2585d9cb05d6df658.tar.gz tor-ecdea4eeafd921f0dcb053f2585d9cb05d6df658.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/dirvote.h')
| -rw-r--r-- | src/or/dirvote.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 1f4dc362b5..b585ccb9d8 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -31,6 +31,8 @@ char *networkstatus_compute_consensus(smartlist_t *votes, consensus_flavor_t flavor); int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out); char *networkstatus_get_detached_signatures(smartlist_t *consensuses); void ns_detached_signatures_free(ns_detached_signatures_t *s); |