aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-15 13:11:06 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-15 13:11:06 -0500
commitaba39ea39075803c974ab6451a55b52deb425468 (patch)
treec37613f1e609098fa96e99884da7c6d0e1e1bc0e /doc
parent744958e0ddc74e7f4db12a5d078d1188bf9f48e1 (diff)
parent405a8d3fb4884d5e5c5f32881a1a810b733a5aad (diff)
downloadtor-aba39ea39075803c974ab6451a55b52deb425468.tar.gz
tor-aba39ea39075803c974ab6451a55b52deb425468.zip
Merge branch 'feature8195_small_squashed'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d8802bf104..7dd8812ff9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -619,6 +619,14 @@ GENERAL OPTIONS
[[User]] **User** __UID__::
On startup, setuid to this user and setgid to their primary group.
+[[KeepBindCapabilities]] **KeepBindCapabilities** **0**|**1**|**auto**::
+ On Linux, when we are started as root and we switch our identity using
+ the **User** option, the **KeepBindCapabilities** option tells us whether to
+ try to retain our ability to bind to low ports. If this value is 1, we
+ try to keep the capability; if it is 0 we do not; and if it is **auto**,
+ we keep the capability only if we are configured to listen on a low port.
+ (Default: auto.)
+
[[HardwareAccel]] **HardwareAccel** **0**|**1**::
If non-zero, try to use built-in (static) crypto hardware acceleration when
available. (Default: 0)