aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/channeltls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-05-07 08:19:11 -0400
committerNick Mathewson <nickm@torproject.org>2020-05-07 08:19:11 -0400
commitb7a165228f02e693b3e777b4c815214bb6e05691 (patch)
treeb79cd6d72f3dffbdee88b9b77b1b5f0240e872e9 /src/core/or/channeltls.c
parent3a785dd5beeaadcd4205f24d6949fdbbdfb5651e (diff)
parentc81c5a2646763c651a9bc17b6213bd25a480eca9 (diff)
downloadtor-b7a165228f02e693b3e777b4c815214bb6e05691.tar.gz
tor-b7a165228f02e693b3e777b4c815214bb6e05691.zip
Merge remote-tracking branch 'tor-github/pr/1880/head'
Diffstat (limited to 'src/core/or/channeltls.c')
-rw-r--r--src/core/or/channeltls.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index e73340ca29..395fbf3455 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -45,6 +45,7 @@
#include "core/or/circuitmux_ewma.h"
#include "core/or/command.h"
#include "app/config/config.h"
+#include "app/config/resolve_addr.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_or.h"
#include "feature/relay/relay_handshake.h"