diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-11 11:10:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-11 11:10:55 -0500 |
| commit | ce450bddb7b66e73e34eec3844623884cbbcc27c (patch) | |
| tree | 0d32b297493f1c14ea479ca12513f414726f9af2 /doc | |
| parent | cb065a55bd209b9c23bc14119c2403680b087885 (diff) | |
| download | tor-ce450bddb7b66e73e34eec3844623884cbbcc27c.tar tor-ce450bddb7b66e73e34eec3844623884cbbcc27c.tar.gz | |
Remove TunnelDirConns and PreferTunnelledDirConns
These options were added back in 0.1.2.5-alpha, but no longer make any
sense now that all directories support tunneled connections and
BEGIN_DIR cells. These options were on by default; now they are
always-on.
This is a fix for 10849, where TunnelDirConns 0 would break hidden
services -- and that bug arrived, I think, in 0.2.0.10-alpha.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ee1e0866e..f168a2fb4 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -584,15 +584,6 @@ GENERAL OPTIONS This is useful when running on flash memory or other media that support only a limited number of writes. (Default: 0) -[[TunnelDirConns]] **TunnelDirConns** **0**|**1**:: - If non-zero, when a directory server we contact supports it, we will build - a one-hop circuit and make an encrypted connection via its ORPort. - (Default: 1) - -[[PreferTunneledDirConns]] **PreferTunneledDirConns** **0**|**1**:: - If non-zero, we will avoid directory servers that don't support tunneled - directory connections, when possible. (Default: 1) - [[CircuitPriorityHalflife]] **CircuitPriorityHalflife** __NUM1__:: If this value is set, we override the default algorithm for choosing which circuit's cell to deliver or relay next. When the value is 0, we |