diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-27 22:39:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-27 22:39:46 -0500 |
| commit | a28df3fb6713043e801fb5fcf5019fc0539b5066 (patch) | |
| tree | c67fce712d60ac0ff073b0c59bb4b06e7dae04b4 /src/test/include.am | |
| parent | 3d2366c676233c30133928940b4bc19d8f25f193 (diff) | |
| parent | 12b6c7df4aaf3224bc5649ef69a06dccc58ae961 (diff) | |
| download | tor-a28df3fb6713043e801fb5fcf5019fc0539b5066.tar.gz tor-a28df3fb6713043e801fb5fcf5019fc0539b5066.zip | |
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
Conflicts:
src/or/or.h
src/test/Makefile.nmake
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am index 9abf3094eb..51c9f73739 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -20,6 +20,8 @@ src_test_test_SOURCES = \ src/test/test_addr.c \ src/test/test_buffers.c \ src/test/test_cell_formats.c \ + src/test/test_channel.c \ + src/test/test_channeltls.c \ src/test/test_circuitlist.c \ src/test/test_circuitmux.c \ src/test/test_containers.c \ @@ -39,8 +41,10 @@ src_test_test_SOURCES = \ src/test/test_options.c \ src/test/test_pt.c \ src/test/test_relaycell.c \ + src/test/test_relay.c \ src/test/test_replay.c \ src/test/test_routerkeys.c \ + src/test/test_scheduler.c \ src/test/test_socks.c \ src/test/test_util.c \ src/test/test_config.c \ |