diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-29 13:43:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-29 14:31:09 -0400 |
| commit | 0ab4dc7ef7c6468c1d0d87a7cbc834217214f16b (patch) | |
| tree | 927d7de0c8846c47a48d3263a2bf989e2b7ab849 /src/feature/dirauth | |
| parent | 231036a110c1062e39b214b4b88fdc2a1eb46dc8 (diff) | |
| download | tor-0ab4dc7ef7c6468c1d0d87a7cbc834217214f16b.tar.gz tor-0ab4dc7ef7c6468c1d0d87a7cbc834217214f16b.zip | |
Move bandwidth-file-headers line to appear in the correct vote section
Fixes bug 30316; bugfix on 0.3.5.1-alpha.
Diffstat (limited to 'src/feature/dirauth')
| -rw-r--r-- | src/feature/dirauth/dirvote.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 5e426b0f86..af8b3dc207 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -322,10 +322,10 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" + "%s" /* bandwidth file headers */ "dir-source %s %s %s %s %d %d\n" "contact %s\n" "%s" /* shared randomness information */ - "%s" /* bandwidth file headers */ , v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", methods, @@ -338,13 +338,12 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, flags, flag_thresholds, params, + bw_headers_line ? bw_headers_line : "", 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 : ""); + shared_random_vote_str : ""); tor_free(params); tor_free(flags); |