aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 7da5ba3fe1..52e81860bb 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1651,7 +1651,12 @@ is non-zero):
If set along with BridgeRelay, Tor will include a new line in its
bridge descriptor which indicates to the BridgeDB service how it
would like its bridge address to be given out. Set it to "none" if
- you want BridgeDB to avoid distributing your bridge address.
+ you want BridgeDB to avoid distributing your bridge address, or "any" to
+ let BridgeDB decide. (Default: any)
+ +
+ Note: as of Oct 2017, the BridgeDB part of this option is not yet
+ implemented. Until BridgeDB is updated to obey this option, your
+ bridge will make this request, but it will not (yet) be obeyed.
[[ContactInfo]] **ContactInfo** __email_address__::
Administrative contact information for this relay or bridge. This line