diff options
| author | teor <teor@torproject.org> | 2019-11-05 14:23:10 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-05 14:23:10 +1000 |
| commit | 61694695469824f5daf5155d5f072dd97be22c32 (patch) | |
| tree | 6d09e71c4ca8f3db5914d5e6b1ec3e37e3e62f95 /src/core | |
| parent | d3af23783c35151a511fc7fc37d88cf41831448c (diff) | |
| parent | bcb38d984d42a75832db9fc8f3b70d54dce472e4 (diff) | |
| download | tor-61694695469824f5daf5155d5f072dd97be22c32.tar.gz tor-61694695469824f5daf5155d5f072dd97be22c32.zip | |
Merge remote-tracking branch 'tor-github/pr/1477'
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/include.am | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/core/include.am b/src/core/include.am index 565668abe3..a69914619e 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -171,14 +171,17 @@ endif LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) # The Relay module. -MODULE_RELAY_SOURCES = \ - src/feature/relay/routermode.c +MODULE_RELAY_SOURCES = \ + src/feature/relay/routermode.c \ + src/feature/relay/relay_config.c \ + src/feature/relay/transport_config.c # The Directory Authority module. -MODULE_DIRAUTH_SOURCES = \ +MODULE_DIRAUTH_SOURCES = \ src/feature/dirauth/authmode.c \ src/feature/dirauth/bridgeauth.c \ src/feature/dirauth/bwauth.c \ + src/feature/dirauth/dirauth_config.c \ src/feature/dirauth/dirauth_periodic.c \ src/feature/dirauth/dirauth_sys.c \ src/feature/dirauth/dircollate.c \ @@ -336,6 +339,7 @@ noinst_HEADERS += \ src/feature/dirauth/authmode.h \ src/feature/dirauth/bridgeauth.h \ src/feature/dirauth/bwauth.h \ + src/feature/dirauth/dirauth_config.h \ src/feature/dirauth/dirauth_periodic.h \ src/feature/dirauth/dirauth_sys.h \ src/feature/dirauth/dircollate.h \ @@ -428,12 +432,14 @@ noinst_HEADERS += \ src/feature/relay/dns_structs.h \ src/feature/relay/ext_orport.h \ src/feature/relay/onion_queue.h \ + src/feature/relay/relay_config.h \ src/feature/relay/relay_periodic.h \ src/feature/relay/relay_sys.h \ src/feature/relay/router.h \ src/feature/relay/routerkeys.h \ src/feature/relay/routermode.h \ src/feature/relay/selftest.h \ + src/feature/relay/transport_config.h \ src/feature/rend/rend_authorized_client_st.h \ src/feature/rend/rend_encoded_v2_service_descriptor_st.h \ src/feature/rend/rend_intro_point_st.h \ |