Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Goulet
Tor
Commits
c90535c5
Commit
c90535c5
authored
Oct 26, 2020
by
Nick Mathewson
🌻
Browse files
Merge branch 'maint-0.4.4'
parents
07f2a06c
c1bcc1da
Changes
4
Hide whitespace changes
Inline
Side-by-side
changes/ticket40164
0 → 100644
View file @
c90535c5
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.
doc/man/tor.1.txt
View file @
c90535c5
...
...
@@ -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"
...
...
src/feature/dirauth/dirauth_options.inc
View file @
c90535c5
...
...
@@ -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. */
...
...
src/feature/dirauth/dirvote.c
View file @
c90535c5
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment