summaryrefslogtreecommitdiff
path: root/src/or/relay_crypto.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/or/relay_crypto.c
parent94c6eb7d7f023e50071632e618f003409e5e6489 (diff)
parent94dcd38a1430061a0bb630ad680a41a78262a55c (diff)
downloadtor-c3b72583709332f051fb61e17f5102d0ada05917.tar.gz
tor-c3b72583709332f051fb61e17f5102d0ada05917.zip
Merge remote-tracking branch 'isis/bug24660_r1'
Diffstat (limited to 'src/or/relay_crypto.c')
-rw-r--r--src/or/relay_crypto.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay_crypto.c b/src/or/relay_crypto.c
index c42a4f9cca..530c8e5828 100644
--- a/src/or/relay_crypto.c
+++ b/src/or/relay_crypto.c
@@ -6,9 +6,10 @@
#include "or.h"
#include "config.h"
+#include "crypto_util.h"
#include "hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN
-#include "relay_crypto.h"
#include "relay.h"
+#include "relay_crypto.h"
/** Update digest from the payload of cell. Assign integrity part to
* cell.