summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-05-31 13:36:50 -0400
committerNick Mathewson <nickm@torproject.org>2009-05-31 13:36:50 -0400
commite84ddead349e5af8c183042d3de27ecb4b6d4e87 (patch)
tree24ed02fe7e2fbfa1c37cfadbb1d7d3fff5ef4d5b /doc
parent3db64b501d62ff2a2807c8f43a12fbab52521e49 (diff)
parent3ca10bb62faaed6a5242ff760ed6c76330a750ef (diff)
downloadtor-e84ddead349e5af8c183042d3de27ecb4b6d4e87.tar.gz
tor-e84ddead349e5af8c183042d3de27ecb4b6d4e87.zip
Merge branch 'hardware_accel_improvements'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.in15
1 files changed, 13 insertions, 2 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index d85747958b..3ac0f92fe2 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -350,8 +350,19 @@ On startup, setuid to this user and setgid to their primary group.
.LP
.TP
\fBHardwareAccel \fR\fB0\fR|\fB1\fP
-If non-zero, try to use crypto hardware acceleration when
-available. This is untested and probably buggy. (Default: 0)
+If non-zero, try to use built-in (static) crypto hardware acceleration when
+available. (Default: 0)
+.LP
+.TP
+\fBAccelName \fR\fINAME\fP
+When using OpenSSL hardware crypto acceleration attempt to load the dynamic
+engine of this name. This must be used for any dynamic hardware engine. Names
+can be verified with the openssl engine command.
+.LP
+.TP
+\fBAccelDir \fR\fIDIR\fP
+Specify this option if using dynamic hardware acceleration and the engine
+implementation library resides somewhere other than the OpenSSL default.
.LP
.TP
\fBAvoidDiskWrites \fR\fB0\fR|\fB1\fP