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

Merge remote-tracking branch 'public/bug11061_024'

Browse Source
This commit is contained in:
Nick Mathewson 2014-03-25 10:02:22 -04:00
commit 1a7794e475
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug11061 Normal file
View File

@ -0,0 +1,3 @@
o Documentation fixes:
- Fix the layout of the SOCKSPort flags in the manpage. Fixes bug
11061; bugfix on 0.2.4.7-alpha.

10
doc/tor.1.txt
View File

@ -972,9 +972,10 @@ The following options are useful only for clients (that is, if
on this port to share circuits with streams from every other
port with the same session group. (By default, streams received
on different SOCKSPorts, TransPorts, etc are always isolated from one
another. This option overrides that behavior.) +
+
Other recognized _flags_ for a SOCKSPort are:
another. This option overrides that behavior.)
[[OtherSOCKSPortFlags]]::
Other recognized __flags__ for a SOCKSPort are:
**NoIPv4Traffic**;;
Tell exits to not connect to IPv4 addresses in response to SOCKS
requests on this connection.
@ -991,7 +992,8 @@ The following options are useful only for clients (that is, if
The SOCKS protocol is unencrypted and (as we use it)
unauthenticated, so exposing it in this way could leak your
information to anybody watching your network, and allow anybody
to use your computer as an open proxy.
to use your computer as an open proxy. +
+
**CacheIPv4DNS**;;
Tells the client to remember IPv4 DNS answers we receive from exit
nodes via this connection. (On by default.)