aboutsummaryrefslogtreecommitdiff
path: root/src/or/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-04-13 09:22:34 -0400
committerNick Mathewson <nickm@torproject.org>2017-04-13 09:22:34 -0400
commit755c88a4746b8b58d1b36486a611abc2d4f44144 (patch)
treef957b8e56f600bcc6f5b6929b3d34428119353b1 /src/or/include.am
parent01fc93ffef3843a86710718c12ba9be67dcca2bc (diff)
parentea5901bf1c6f201f5618aca21ddbb9c41893f147 (diff)
downloadtor-755c88a4746b8b58d1b36486a611abc2d4f44144.tar.gz
tor-755c88a4746b8b58d1b36486a611abc2d4f44144.zip
Merge branch 'asn/prop224-ntor-v2-squashed'
Diffstat (limited to 'src/or/include.am')
-rw-r--r--src/or/include.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/include.am b/src/or/include.am
index 688ac625ea..1841bbfe9d 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -50,6 +50,7 @@ LIBTOR_A_SOURCES = \
src/or/geoip.c \
src/or/hs_intropoint.c \
src/or/hs_circuitmap.c \
+ src/or/hs_ntor.c \
src/or/hs_service.c \
src/or/entrynodes.c \
src/or/ext_orport.c \
@@ -175,6 +176,7 @@ ORHEADERS = \
src/or/hs_descriptor.h \
src/or/hs_intropoint.h \
src/or/hs_circuitmap.h \
+ src/or/hs_ntor.h \
src/or/hs_service.h \
src/or/keypin.h \
src/or/main.h \