diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-04-28 10:19:16 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-04-28 10:19:16 -0400 |
commit | 24f170a11f59e26dec3a24d076b749c8acc793ca (patch) | |
tree | 4f0e2423cc8348c86cf735f58d9eca077a5bcd50 /src/test/include.am | |
parent | 028cac97c1953f666c89711e31754cec4273b2d0 (diff) | |
parent | 915c7438a77edfaf3103b69cb494a4f069a79a0c (diff) | |
download | tor-24f170a11f59e26dec3a24d076b749c8acc793ca.tar.gz tor-24f170a11f59e26dec3a24d076b749c8acc793ca.zip |
Merge branch 'feature6411_v4'
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 570048dc44..c36ebb777a 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -56,6 +56,7 @@ src_test_test_SOURCES = \ src/test/test_circuitmux.c \ src/test/test_config.c \ src/test/test_containers.c \ + src/test/test_controller.c \ src/test/test_controller_events.c \ src/test/test_crypto.c \ src/test/test_data.c \ |