nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source
This commit is contained in:
Nick Mathewson 2012-07-31 10:18:05 -04:00
commit e6d61ee594
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/bug6500 Normal file
View File

@ -0,0 +1,2 @@
o Minor bugfixes:
- Fix some typos in the manpages. Patch from A. Costa. Fixes bug 6500.

4
doc/tor.1.txt
View File

@ -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**::

2
doc/torify.1.txt
View File

@ -21,7 +21,7 @@ DESCRIPTION
wrapper available on a system. It calls torsocks or tsocks with a tor specific
configuration file. +
torsocks is an improved wrapper that explictly rejects UDP, safely resolves DNS
torsocks is an improved wrapper that explicitly rejects UDP, safely resolves DNS
lookups and properly socksifies your TCP connections. +
tsocks itself is a wrapper between the tsocks library and the application that