diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-10-26 16:39:31 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-10-26 16:39:31 -0400 |
commit | c90535c539c60b031a3235d7e26b802865ef14c4 (patch) | |
tree | a0ed6bf861e4c9d1686ec4253de0548139a6ec91 /src/feature/dirauth/dirvote.c | |
parent | 07f2a06c6190696cf47b8e42476bb70b11083f15 (diff) | |
parent | c1bcc1da038c5e70f2bdecc6296605d238db448c (diff) | |
download | tor-c90535c539c60b031a3235d7e26b802865ef14c4.tar.gz tor-c90535c539c60b031a3235d7e26b802865ef14c4.zip |
Merge branch 'maint-0.4.4'
Diffstat (limited to 'src/feature/dirauth/dirvote.c')
-rw-r--r-- | src/feature/dirauth/dirvote.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index f56d3ef0a0..a1f9bb28ae 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4795,9 +4795,12 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, smartlist_sort_strings(v3_out->known_flags); if (d_options->ConsensusParams) { + config_line_t *paramline = d_options->ConsensusParams; v3_out->net_params = smartlist_new(); - smartlist_split_string(v3_out->net_params, - d_options->ConsensusParams, NULL, 0, 0); + for ( ; paramline; paramline = paramline->next) { + smartlist_split_string(v3_out->net_params, + paramline->value, NULL, 0, 0); + } smartlist_sort_strings(v3_out->net_params); } v3_out->bw_file_headers = bw_file_headers; |