diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-11 01:39:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-11 01:39:55 -0400 |
| commit | 7f50af116f2497a73fe9113e814a5765047cf3ca (patch) | |
| tree | 8b31ff3c061a6978afb5438e52dc4b74124cf1c8 /doc | |
| parent | 6acf0ac2851fb95953edea9c231d82f487f28c3d (diff) | |
| parent | fa3c23773944788125db2f67bcb048376c17fec9 (diff) | |
| download | tor-7f50af116f2497a73fe9113e814a5765047cf3ca.tar tor-7f50af116f2497a73fe9113e814a5765047cf3ca.tar.gz | |
Merge remote-tracking branch 'public/bug8117_023' into maint-0.2.4
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/connection.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c502c57dd..f35d63958 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -972,6 +972,15 @@ The following options are useful only for clients (that is, if should get automapped (according to AutomapHostsOnResove), if we could return either an IPv4 or an IPv6 answer, prefer an IPv6 answer. (On by default.) + **PreferSOCKSNoAuth**;; + Ordinarily, when an application offers both "username/password + authentication" and "no authentication" to Tor via SOCKS5, Tor + selects username/password authentication so that IsolateSOCKSAuth can + work. This can confuse some applications, if they offer a + username/password combination then get confused when asked for + one. You can disable this behavior, so that Tor will select "No + authentication" when IsolateSOCKSAuth is disabled, or when this + option is set. **SOCKSListenAddress** __IP__[:__PORT__]:: Bind to this address to listen for connections from Socks-speaking |