diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-19 11:43:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-19 11:43:41 -0500 |
| commit | 1053af0b9c4127873034a935ce3382940696e693 (patch) | |
| tree | 0ddf532fac615a4a7dd554b09ca1d6e41623d80a /src/test/include.am | |
| parent | 63765399eb844adfa877a288e655eb281ac8c988 (diff) | |
| parent | 758d77130c654bcf71ba28a3ba75bd8569efc985 (diff) | |
| download | tor-1053af0b9c4127873034a935ce3382940696e693.tar.gz tor-1053af0b9c4127873034a935ce3382940696e693.zip | |
Merge branch 'bug7555_v2_squashed'
Conflicts:
src/or/connection_edge.c
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am index b9b381fdae..134c2ff56c 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -31,6 +31,7 @@ src_test_test_SOURCES = \ src/test/test_data.c \ src/test/test_dir.c \ src/test/test_checkdir.c \ + src/test/test_entryconn.c \ src/test/test_entrynodes.c \ src/test/test_extorport.c \ src/test/test_introduce.c \ |