diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-11-21 18:36:49 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-11-21 18:36:49 -0500 |
| commit | 6a76007b089a2ca31b67b2ce15dd28edeb416428 (patch) | |
| tree | d61bc05bc50b9f4ac8782f321ae6af960c8fa9db /doc | |
| parent | c9f24edb13faf17dc314be51127736acfc3de17a (diff) | |
| parent | 97a209ea28f1b64fba51157e3e695c676eb0cf8e (diff) | |
| download | tor-6a76007b089a2ca31b67b2ce15dd28edeb416428.tar.gz tor-6a76007b089a2ca31b67b2ce15dd28edeb416428.zip | |
Merge branch 'maint-0.2.2'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b54735d383..bc0435d4d9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1406,6 +1406,16 @@ DIRECTORY AUTHORITY SERVER OPTIONS Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies to addresses shared with directory authorities. (Default: 5) +**AuthDirFastGuarantee** __N__ **bytes**|**KB**|**MB**|**GB**:: + Authoritative directories only. If non-zero, always vote the + Fast flag for any relay advertising this amount of capacity or + more. (Default: 20 KB) + +**AuthDirGuardBWGuarantee** __N__ **bytes**|**KB**|**MB**|**GB**:: + Authoritative directories only. If non-zero, this advertised capacity + or more is always sufficient to satisfy the bandwidth requirement + for the Guard flag. (Default: 250 KB) + **BridgePassword** __Password__:: If set, contains an HTTP authenticator that tells a bridge authority to serve all requested bridge information. Used for debugging. (Default: |