diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-08-26 11:27:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-08-26 11:27:19 -0400 |
| commit | 707a6bd6595024e0b4a998e0a99eb284499a37e3 (patch) | |
| tree | dd3230c44404c42b7fcab590466b0c2d3ad99c61 /doc | |
| parent | f1b5fd2aaa81daaa9065a7f0193be5855e7d4e32 (diff) | |
| parent | 903f9ef50e418f6ec1a1ab7ae8146e9d6d2a7767 (diff) | |
| download | tor-707a6bd6595024e0b4a998e0a99eb284499a37e3.tar.gz tor-707a6bd6595024e0b4a998e0a99eb284499a37e3.zip | |
Merge commit 'public/socks-client'
Resolved conflict in:
src/or/or.h
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.in | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index a49a26d47b..9386b90a14 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -299,6 +299,25 @@ HTTPS proxy authentication that Tor supports; feel free to submit a patch if you want it to support others. .LP .TP +\fBSocks4Proxy\fR \fIhost\fR[:\fIport\fR]\fP +Tor will make all OR connections through the SOCKS 4 proxy at host:port +(or host:1080 if port is not specified). +.LP +.TP +\fBSocks5Proxy\fR \fIhost\fR[:\fIport\fR]\fP +Tor will make all OR connections through the SOCKS 5 proxy at host:port +(or host:1080 if port is not specified). +.LP +.TP +\fBSocks5ProxyUsername\fR \fIusername\fP +.LP +.TP +\fBSocks5ProxyPassword\fR \fIpassword\fP +If defined, authenticate to the SOCKS 5 server using username and password +in accordance to RFC 1929. Both username and password must be between 1 and 255 +characters. +.LP +.TP \fBKeepalivePeriod \fR\fINUM\fP To keep firewalls from expiring connections, send a padding keepalive cell every NUM seconds on open connections that are in use. If the |