diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-29 13:48:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-29 14:34:03 -0400 |
| commit | 821dd54586bffd95bdd8c9d333b1f80ef55d3742 (patch) | |
| tree | ccabe51b9601cc9e8ce28b411656915aa83009f4 /src/feature/dirauth | |
| parent | 593d29920e264180a7a6849fc59224a8869388d7 (diff) | |
| parent | 0ab4dc7ef7c6468c1d0d87a7cbc834217214f16b (diff) | |
| download | tor-821dd54586bffd95bdd8c9d333b1f80ef55d3742.tar.gz tor-821dd54586bffd95bdd8c9d333b1f80ef55d3742.zip | |
Merge branch 'bug30316_035' into bug30316_040
Fixes conflicts and also moves bandwidth-file-digest.
Diffstat (limited to 'src/feature/dirauth')
| -rw-r--r-- | src/feature/dirauth/dirvote.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 29f5d04509..755b99bae2 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -348,11 +348,11 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" + "%s" /* bandwidth file headers */ + "%s" /* bandwidth file digest */ "dir-source %s %s %s %s %d %d\n" "contact %s\n" "%s" /* shared randomness information */ - "%s" /* bandwidth file headers */ - "%s" /* bandwidth file */ , v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", methods, @@ -365,14 +365,13 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, flags, flag_thresholds, params, + bw_headers_line ? bw_headers_line : "", + bw_file_digest ? bw_file_digest: "", voter->nickname, fingerprint, voter->address, fmt_addr32(addr), voter->dir_port, voter->or_port, voter->contact, shared_random_vote_str ? - shared_random_vote_str : "", - bw_headers_line ? - bw_headers_line : "", - bw_file_digest ? bw_file_digest: ""); + shared_random_vote_str : ""); tor_free(params); tor_free(flags); |