aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-23 10:38:19 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-24 19:26:24 -0400
commit3581f93d273dfd9fbc56de907b7e3b77575614e1 (patch)
tree0bef9a27bcfffd42c315b2e871b320446abd791b /doc
parentebab5215252f9fa810ae091c335c5ae6e619faaf (diff)
downloadtor-3581f93d273dfd9fbc56de907b7e3b77575614e1.tar.gz
tor-3581f93d273dfd9fbc56de907b7e3b77575614e1.zip
Tweak the documentation for BridgeDistribution
Note that it will have no effect yet; note that the default is "any".
Diffstat (limited to 'doc')
-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