nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.4'

Browse Source
This commit is contained in:
Nick Mathewson 2020-10-26 16:39:31 -04:00
commit c90535c539
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/ticket40164 Normal file
View File

@ -0,0 +1,6 @@
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.

3
doc/man/tor.1.txt
View File

@ -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"

2
src/feature/dirauth/dirauth_options.inc
View File

@ -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. */

7
src/feature/dirauth/dirvote.c
View File

@ -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;