diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-01-16 11:32:39 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-01-16 11:35:48 -0500 |
commit | 485fdcf8268173da94f7feba5753956eb2672ca4 (patch) | |
tree | e616cca21d0e840cd9b188b9646ac8e0533e35de /doc/tor.1.txt | |
parent | bbad23bf37da8d453b8aa3fbfa19c39ec62150c6 (diff) | |
download | tor-485fdcf8268173da94f7feba5753956eb2672ca4.tar.gz tor-485fdcf8268173da94f7feba5753956eb2672ca4.zip |
Unify parse_unix_socket_config and parse_port_config
This incidentally makes unix SocksSocket support all the same options
as SocksPort.
This patch breaks 'SocksSocket 0'; next will restore it.
Resolves 14254.
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a6f3b6dad4..a38b7dccca 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -483,7 +483,7 @@ GENERAL OPTIONS in accordance to RFC 1929. Both username and password must be between 1 and 255 characters. -[[SocksSocket]] **SocksSocket** __Path__:: +[[SocksSocket]] **SocksSocket** __Path__ [_flags_] [_isolation flags_]:: Like SocksPort, but listens on a Unix domain socket, rather than a TCP socket. '0' disables SocksSocket (Unix and Unix-like systems only.) |