diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-31 10:18:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-31 10:18:05 -0400 |
| commit | e6d61ee59430162fd7b820278f3dfa1677ad81d8 (patch) | |
| tree | 3b913fb3e27719339792c92b0330fabda994679f /doc/tor.1.txt | |
| parent | 1049d315d7055cb98095001cb5fefae0f40d36de (diff) | |
| parent | d9bd0de0628ff3ac9d84409315ad6df38981f019 (diff) | |
| download | tor-e6d61ee59430162fd7b820278f3dfa1677ad81d8.tar.gz tor-e6d61ee59430162fd7b820278f3dfa1677ad81d8.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 364bfdc2f4..f1ae7bb4f1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -169,7 +169,7 @@ GENERAL OPTIONS duty of that proxy to properly forward the traffic to the bridge. + + In its second form, when set along with a corresponding Bridge line, the Tor - client launches the pluggable transport proxy exacutable in + client launches the pluggable transport proxy executable in __path-to-binary__ using __options__ as its command-line options, and forwards its traffic to it. It's the duty of that proxy to properly forward the traffic to the bridge. @@ -1709,7 +1709,7 @@ DIRECTORY AUTHORITY SERVER OPTIONS **V3BandwidthsFile** __FILENAME__:: V3 authoritative directories only. Configures the location of the - bandiwdth-authority generated file storing information on relays' measured + bandwidth-authority generated file storing information on relays' measured bandwidth capacities. (Default: unset) **V3AuthUseLegacyKey** **0**|**1**:: |