diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-04 13:26:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-04 13:26:37 -0400 |
| commit | c35c43d7d9df793c890deb14800e24327fbca452 (patch) | |
| tree | 3f6f3623c301b1900fbf58bb84ec86657baebce0 /src/test/include.am | |
| parent | bd6aa4f3d19a571adeaa956728f7e842d847c4ee (diff) | |
| parent | c189cb5cc29e92e55f8e94b5531d2626eff71d63 (diff) | |
| download | tor-c35c43d7d9df793c890deb14800e24327fbca452.tar.gz tor-c35c43d7d9df793c890deb14800e24327fbca452.zip | |
Merge branch 'ticket17238_029_02-resquash'
Conflicts:
src/or/rendclient.c
src/or/rendcommon.c
src/or/routerparse.c
src/test/test_dir.c
src/trunnel/ed25519_cert.h
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am index 4af48cfbc1..f6e43148f0 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -97,6 +97,8 @@ src_test_test_SOURCES = \ src/test/test_extorport.c \ src/test/test_hs.c \ src/test/test_handles.c \ + src/test/test_hs_cache.c \ + src/test/test_hs_descriptor.c \ src/test/test_introduce.c \ src/test/test_keypin.c \ src/test/test_link_handshake.c \ |