aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirvote.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-25 14:55:41 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-26 10:56:51 -0700
commitf33b90324abe11724f59389e1aeaf8b3e021c3af (patch)
tree62090b34128900b39ca03672f33702cb6f4146b6 /src/or/dirvote.c
parentd97a3855350aacd1ea776506624171952fab8ed8 (diff)
downloadtor-f33b90324abe11724f59389e1aeaf8b3e021c3af.tar.gz
tor-f33b90324abe11724f59389e1aeaf8b3e021c3af.zip
Include protocol versions in votes.
Diffstat (limited to 'src/or/dirvote.c')
-rw-r--r--src/or/dirvote.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 2d840a5988..67f0ba8cc7 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -244,7 +244,8 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
char *rsf;
vote_microdesc_hash_t *h;
rsf = routerstatus_format_entry(&vrs->status,
- vrs->version, NS_V3_VOTE, vrs);
+ vrs->version, vrs->protocols,
+ NS_V3_VOTE, vrs);
if (rsf)
smartlist_add(chunks, rsf);
@@ -2007,7 +2008,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
char *buf;
/* Okay!! Now we can write the descriptor... */
/* First line goes into "buf". */
- buf = routerstatus_format_entry(&rs_out, NULL, rs_format, NULL);
+ buf = routerstatus_format_entry(&rs_out, NULL, NULL, rs_format, NULL);
if (buf)
smartlist_add(chunks, buf);
}