summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2016-11-13 02:39:16 -0500
committerNick Mathewson <nickm@torproject.org>2017-10-24 19:26:24 -0400
commitebab5215252f9fa810ae091c335c5ae6e619faaf (patch)
tree1e4bd4e7751f48dd93d31de404014653a92d8d3b /doc/tor.1.txt
parentfcd5c3144a44f4081e9e7c4336b932e31ae45f77 (diff)
downloadtor-ebab5215252f9fa810ae091c335c5ae6e619faaf.tar.gz
tor-ebab5215252f9fa810ae091c335c5ae6e619faaf.zip
Add new BridgeDistribution config option
Bridge relays can use it to add a "bridge-distribution-request" line to their bridge descriptor, which tells BridgeDB how they'd like their bridge address to be given out. Implements tickets 18329.
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f1068cedc6..7da5ba3fe1 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1647,6 +1647,12 @@ is non-zero):
server descriptor to the bridge database, rather than
to the public directory authorities.
+[[BridgeDistribution]] **BridgeDistribution** __string__::
+ 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.
+
[[ContactInfo]] **ContactInfo** __email_address__::
Administrative contact information for this relay or bridge. This line
can be used to contact you if your relay or bridge is misconfigured or