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/or/routerlist.h | |
| 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/or/routerlist.h')
| -rw-r--r-- | src/or/routerlist.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 100ab5848f..ec09f234a5 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -243,4 +243,3 @@ MOCK_DECL(STATIC void, initiate_descriptor_downloads, #endif #endif - |