Commit c90535c5 authored by Nick Mathewson's avatar Nick Mathewson
Browse files

Merge branch 'maint-0.4.4'

parents 07f2a06c c1bcc1da
o Minor features (directory authority):
- Make it possible to specify multiple ConsensusParams torrc lines.
Now directory authority operators can for example put the main
ConsensusParams config in one torrc file and then add to it from
a different torrc file. Closes ticket 40164.
......@@ -3062,7 +3062,8 @@ on the public Tor network.
[[ConsensusParams]] **ConsensusParams** __STRING__::
STRING is a space-separated list of key=value pairs that Tor will include
in the "params" line of its networkstatus vote.
in the "params" line of its networkstatus vote. This directive can be
specified multiple times so you don't have to put it all on one line.
[[DirAllowPrivateAddresses]] **DirAllowPrivateAddresses** **0**|**1**::
If set to 1, Tor will accept server descriptors with arbitrary "Address"
......
......@@ -53,7 +53,7 @@ CONF_VAR(AuthDirTestReachability, BOOL, 0, "1")
/** Authority only: key=value pairs that we add to our networkstatus
* consensus vote on the 'params' line. */
CONF_VAR(ConsensusParams, STRING, 0, NULL)
CONF_VAR(ConsensusParams, LINELIST, 0, NULL)
/** Authority only: minimum number of measured bandwidths we must see
* before we only believe measured bandwidths to assign flags. */
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment