aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
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 /src/or/router.c
parent3db64b501d62ff2a2807c8f43a12fbab52521e49 (diff)
parent3ca10bb62faaed6a5242ff760ed6c76330a750ef (diff)
downloadtor-e84ddead349e5af8c183042d3de27ecb4b6d4e87.tar.gz
tor-e84ddead349e5af8c183042d3de27ecb4b6d4e87.zip
Merge branch 'hardware_accel_improvements'
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index a1a56b0d01..e5f3b52ec9 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -442,7 +442,9 @@ init_keys(void)
key_lock = tor_mutex_new();
/* There are a couple of paths that put us here before */
- if (crypto_global_init(get_options()->HardwareAccel)) {
+ if (crypto_global_init(get_options()->HardwareAccel,
+ get_options()->AccelName,
+ get_options()->AccelDir)) {
log_err(LD_BUG, "Unable to initialize OpenSSL. Exiting.");
return -1;
}