diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-08 13:55:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-08 13:55:02 -0400 |
| commit | 245f273aaf6a6189a57d837d5fd76b76cc9b6f8e (patch) | |
| tree | 2806ce750222a7e80e6151656360aeeb0a6d93eb /src/test/include.am | |
| parent | 3ac426afe8f169cb2c16de9d37b8630b7c3216f5 (diff) | |
| parent | 51e13cd1ad5f7c130521e2a964ea462f35d1880e (diff) | |
| download | tor-245f273aaf6a6189a57d837d5fd76b76cc9b6f8e.tar tor-245f273aaf6a6189a57d837d5fd76b76cc9b6f8e.tar.gz | |
Merge branch 'bug7952_final'
Conflicts:
src/test/include.am
src/test/test.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 c59ebb2ad..34bbe6b5e 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -43,6 +43,7 @@ src_test_test_SOURCES = \ src/test/test_config.c \ src/test/test_hs.c \ src/test/test_nodelist.c \ + src/test/test_policy.c \ src/ext/tinytest.c src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) |