summaryrefslogtreecommitdiff
path: root/src/common/aes.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-03 13:50:18 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-03 13:50:18 -0400
commitc3b72583709332f051fb61e17f5102d0ada05917 (patch)
treea686097afdcda0074eb00d7b6e667abf91dc19e5 /src/common/aes.c
parent94c6eb7d7f023e50071632e618f003409e5e6489 (diff)
parent94dcd38a1430061a0bb630ad680a41a78262a55c (diff)
downloadtor-c3b72583709332f051fb61e17f5102d0ada05917.tar.gz
tor-c3b72583709332f051fb61e17f5102d0ada05917.zip
Merge remote-tracking branch 'isis/bug24660_r1'
Diffstat (limited to 'src/common/aes.c')
-rw-r--r--src/common/aes.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c
index 95737cffcc..a83a654348 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -17,7 +17,6 @@
#endif
#include <openssl/opensslv.h>
-#include "crypto.h"
#include "crypto_openssl_mgt.h"
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)