diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:10:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:10:22 -0500 |
| commit | 3b88b638264011158d27d5b451fd07d16f60e16b (patch) | |
| tree | 3af8591550471211fd0ee0a20f9602c4d761a7ce /src/test/Makefile.am | |
| parent | 60b41cd435c0acef274209a2a9b494b5f42964f6 (diff) | |
| parent | e8d598c4acc55b655f2e49566bf8802d7d6524ba (diff) | |
| download | tor-3b88b638264011158d27d5b451fd07d16f60e16b.tar.gz tor-3b88b638264011158d27d5b451fd07d16f60e16b.zip | |
Merge branch 'bug933_nm_rebased_v2'
Conflicts:
src/test/test.c
Diffstat (limited to 'src/test/Makefile.am')
| -rw-r--r-- | src/test/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/Makefile.am b/src/test/Makefile.am index ffe1f942e7..73de300719 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -21,6 +21,7 @@ test_SOURCES = \ test_microdesc.c \ test_pt.c \ test_util.c \ + test_config.c \ tinytest.c bench_SOURCES = \ |