diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-10-06 11:32:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-10-06 11:32:06 -0400 |
| commit | f179abdca935d6d119f66e469232b36955a292b4 (patch) | |
| tree | f00e05fced86c7f6ad77d03fb0bdaa2961597ae8 /src/test/rend_test_helpers.c | |
| parent | 2592d537f95173083e397d19e182346955741221 (diff) | |
| parent | 70de8d4bf86c430969bb314ba8590c00ce4dd374 (diff) | |
| download | tor-f179abdca935d6d119f66e469232b36955a292b4.tar.gz tor-f179abdca935d6d119f66e469232b36955a292b4.zip | |
Merge remote-tracking branch 'twstrike/rendcache_tests'
Conflicts:
src/test/include.am
src/test/rend_test_helpers.c
src/test/rend_test_helpers.h
Diffstat (limited to 'src/test/rend_test_helpers.c')
| -rw-r--r-- | src/test/rend_test_helpers.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/rend_test_helpers.c b/src/test/rend_test_helpers.c index 0a1b1c8967..f076d76fd6 100644 --- a/src/test/rend_test_helpers.c +++ b/src/test/rend_test_helpers.c @@ -1,7 +1,10 @@ -#include "rend_test_helpers.h" +/* Copyright (c) 2014-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ +#include "or.h" #include "test.h" #include "rendcommon.h" +#include "rend_test_helpers.h" void generate_desc(int time_diff, rend_encoded_v2_service_descriptor_t **desc, |