summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-17 20:39:13 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-17 20:39:13 -0400
commit3640c63498399f85d44358b0d3cfd8a6d62325f4 (patch)
tree4553520cc7a66ed795b184ca8f7ac4b998c59908 /src/or/or.h
parent16dd2f7bb0df8c6d45d62e4d515089a3a566fd8e (diff)
parentd38e7ddf5b930ae7e4d3a5da63cfc32d92a8dfa7 (diff)
downloadtor-3640c63498399f85d44358b0d3cfd8a6d62325f4.tar.gz
tor-3640c63498399f85d44358b0d3cfd8a6d62325f4.zip
Merge remote-tracking branch 'ffmancera-1/bug24658-dh_stream'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index e106ec66fa..345aa6bed8 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -68,6 +68,8 @@
#include "crypto.h"
#include "crypto_format.h"
+#include "crypto_dh.h"
+#include "crypto_hkdf.h"
#include "tortls.h"
#include "torlog.h"
#include "container.h"