torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ticket17238_029_02-resquash'

Browse Source 
Conflicts:
	src/or/rendclient.c
	src/or/rendcommon.c
	src/or/routerparse.c
	src/test/test_dir.c
	src/trunnel/ed25519_cert.h
This commit is contained in:
Nick Mathewson
2016-11-04 13:26:37 -04:00
parent bd6aa4f3d1 c189cb5cc2
commit c35c43d7d9
44 changed files with 7167 additions and 1181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/include.am
+2
View File
@@ -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 \