aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-23 15:57:56 -0400
committerNick Mathewson <nickm@torproject.org>2014-03-23 15:57:56 -0400
commit6709a1f58d56f0f7e97d9fdc07e7dc8cae63a33a (patch)
treee77bbbedaafdbf57b350c57900cd388bc156c0ef /src
parent3ddbf2880f315784280e0b8367e5e08043b4236e (diff)
parentc08b47977ef93ddd3b43cede365a352cc87e16bd (diff)
downloadtor-6709a1f58d56f0f7e97d9fdc07e7dc8cae63a33a.tar.gz
tor-6709a1f58d56f0f7e97d9fdc07e7dc8cae63a33a.zip
Merge remote-tracking branch 'arma/bug11276'
Diffstat (limited to 'src')
-rw-r--r--src/common/crypto.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 12a695b9cb..f357934ac9 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -282,6 +282,9 @@ int
crypto_early_init(void)
{
if (!crypto_early_initialized_) {
+
+ crypto_early_initialized_ = 1;
+
ERR_load_crypto_strings();
OpenSSL_add_all_algorithms();