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 'bug12844'

Browse Source 
Conflicts:
	src/or/circuituse.c
	src/test/include.am
	src/test/test_entrynodes.c
This commit is contained in:
Nick Mathewson
2015-02-11 15:06:04 -05:00
parent 0c81dfa848 0899f51bc6
commit caf28519d9
14 changed files with 305 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/include.am
+4 -1
View File
@@ -62,6 +62,7 @@ src_test_test_SOURCES = \
src/test/test_threads.c \
src/test/test_util.c \
src/test/testing_common.c \
src/test/testhelper.c \
src/ext/tinytest.c
src_test_test_slow_SOURCES = \
@@ -119,10 +120,12 @@ src_test_test_workqueue_LDADD = src/or/libtor-testing.a \
noinst_HEADERS+= \
src/test/fakechans.h \
src/test/test.h \
src/test/testhelper.h \
src/test/test_descriptors.inc \
src/test/example_extrainfo.inc \
src/test/failing_routerdescs.inc \
src/test/ed25519_vectors.inc
src/test/ed25519_vectors.inc \
src/test/test_descriptors.inc
noinst_PROGRAMS+= src/test/test-ntor-cl
src_test_test_ntor_cl_SOURCES = src/test/test_ntor_cl.c