diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-04-01 16:03:16 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-04-01 16:03:16 -0400 |
| commit | c7cbd06d5f2727c3742dfd426223f1f1ebe46f94 (patch) | |
| tree | 6d11c441c5beb4d0589023aae6de17b0980ad6c0 /doc | |
| parent | 341c6a59db09a43ee2301a6c59158b09ec55134b (diff) | |
| parent | 5fed1ccd901d4751a3fed7dc01042771ca76f449 (diff) | |
| download | tor-c7cbd06d5f2727c3742dfd426223f1f1ebe46f94.tar.gz tor-c7cbd06d5f2727c3742dfd426223f1f1ebe46f94.zip | |
Merge branch 'maint-0.2.2'
Conflicts:
src/or/config.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index fff9e877c6..bd67661a83 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1555,8 +1555,11 @@ DIRECTORY AUTHORITY SERVER OPTIONS **BridgePassword** __Password__:: If set, contains an HTTP authenticator that tells a bridge authority to - serve all requested bridge information. Used for debugging. (Default: - not set.) + serve all requested bridge information. Used by the (only partially + implemented) "bridge community" design, where a community of bridge + relay operators all use an alternate bridge directory authority, + and their target user audience can periodically fetch the list of + available community bridges to stay up-to-date. (Default: not set.) **V3AuthVotingInterval** __N__ **minutes**|**hours**:: V3 authoritative directories only. Configures the server's preferred voting |