summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-28 16:12:01 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-28 16:12:01 -0400
commit76843639e58d433e8860e336eff52497d0f1ec35 (patch)
treee3029bbe1d73278a518a21a1ad4af11d9bad95d7 /doc
parentb26db5dddb659f76ed3eb51f786ea76f7a5d009d (diff)
parent40d5b573a4b5ba1f06e0d842dde9e2a8e4dab5d0 (diff)
downloadtor-76843639e58d433e8860e336eff52497d0f1ec35.tar.gz
tor-76843639e58d433e8860e336eff52497d0f1ec35.zip
Merge remote-tracking branch 'teor/bug22747'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt11
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index e149a951c9..4f930c5291 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -303,8 +303,15 @@ GENERAL OPTIONS
descriptors as the OS will allow (you can find this by "ulimit -H -n").
If this number is less than ConnLimit, then Tor will refuse to start. +
+
- You probably don't need to adjust this. It has no effect on Windows
- since that platform lacks getrlimit(). (Default: 1000)
+ Tor relays need thousands of sockets, to connect to every other relay.
+ If you are running a private bridge, you can reduce the number of sockets
+ that Tor uses. For example, to limit Tor to 500 sockets, run
+ "ulimit -n 500" in a shell. Then start tor in the same shell, with
+ **ConnLimit 500**. You may also need to set **DisableOOSCheck 0**. +
+ +
+ Unless you have severely limited sockets, you probably don't need to
+ adjust **ConnLimit** itself. It has no effect on Windows, since that
+ platform lacks getrlimit(). (Default: 1000)
[[DisableNetwork]] **DisableNetwork** **0**|**1**::
When this option is set, we don't listen for or accept any connections