summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-28 14:36:28 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-28 14:42:21 -0400
commit73d93c033d3f4b9c95e8f3a5cc7e4a255d523b84 (patch)
tree4a6ef543d04d0153134d973977b0e5bfce80425d /doc/tor.1.txt
parentc612ddee17c2f6e70fde9f0bdd7116516f384ae8 (diff)
downloadtor-73d93c033d3f4b9c95e8f3a5cc7e4a255d523b84.tar.gz
tor-73d93c033d3f4b9c95e8f3a5cc7e4a255d523b84.zip
Autodetect the number of CPUs when possible if NumCPUs==0
This is needed for IOCP, since telling the IOCP backend about all your CPUs is a good idea. It'll also come in handy with asn's multithreaded crypto stuff, and for people who run servers without reading the manual.
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index e9ef55166c..e670bdb6b7 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -860,7 +860,9 @@ is non-zero):
characters inclusive, and must contain only the characters [a-zA-Z0-9].
**NumCPUs** __num__::
- How many processes to use at once for decrypting onionskins. (Default: 1)
+ How many processes to use at once for decrypting onionskins and other
+ parallelizable operations. If this is set to 0, Tor will try to detect
+ how many CPUs you have, defaulting to 1 if it can't tell. (Default: 0)
**ORPort** __PORT__::
Advertise this port to listen for connections from Tor clients and servers.