bridges config example: Add bridges section to example config
This is precisely the text from the original version of !744. There is no implementation yet, so we must add a entry to the exception list in the tests.
This commit is contained in:
parent
136e511390
commit
86364e6f0a
|
@ -114,6 +114,27 @@
|
|||
# ignore_prefix = "/home/"
|
||||
#ignore_prefix = ""
|
||||
|
||||
# Bridges (for anticensorship support)
|
||||
[bridges]
|
||||
|
||||
# Should we use configured bridges?
|
||||
# If set to false, we will ignore the configured bridges.
|
||||
# If set to "auto", we will use any bridges that are configured.
|
||||
# If set to true, bridges must be configured and will be used.
|
||||
#enabled = "auto"
|
||||
|
||||
# What bridges (including pluggable transports) to use:
|
||||
# bridges = [
|
||||
# "<IP>:<ORPort> <fingerprint> [<fingerprint> ...]",
|
||||
# "<transport> <host>:<ORPort>|- <fingerprint> [...] [<key>=<val> ...]",
|
||||
# ]
|
||||
# You may specify all the bridge lines in one multi-line string:
|
||||
# bridges = '''
|
||||
# <IP>:<ORPort> <fingerprint> [<fingerprint>...],
|
||||
# <transport> <host>:<ORPort>|- <fingerprint> [...] [<key>=<val> ...],
|
||||
# '''
|
||||
#bridges = []
|
||||
|
||||
# Replacement values for consensus parameters. This is an advanced option
|
||||
# and you probably should leave it alone. Not all parameters are supported.
|
||||
# These are case-sensitive.
|
||||
|
|
|
@ -306,6 +306,9 @@ mod test {
|
|||
"storage.permissions.trust_user",
|
||||
]);
|
||||
|
||||
// TODO pt-client
|
||||
known_unrecognized_options_new.extend(["bridges"]);
|
||||
|
||||
// The unrecognized options in new are those that are only new, plus those in all
|
||||
known_unrecognized_options_new.extend(known_unrecognized_options_all.clone());
|
||||
|
||||
|
|
Loading…
Reference in New Issue