Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged

Resolved conflicts in src/core/include.am

diff --cc src/app/config/config.c
Simple merge

diff --cc src/core/include.am
index 41347ed64aa42a7c02948919587967e77166dc4a,f332b3758b0a4a2aa5bc37f5b1389962ab9d4e49..7752a7974b7553356e245b1503282d89d5fe7bfa
--- 1/src/core/include.am
--- 2/src/core/include.am
+++ b/src/core/include.am
@@@ -7,7 -172,59 +7,6 @@@
  #
  LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES)
  
 -# The Relay module.
 -MODULE_RELAY_SOURCES =                                                \
 -      src/feature/relay/routermode.c                          \
 -      src/feature/relay/relay_config.c                        \
 -      src/feature/relay/relay_periodic.c                      \
 -      src/feature/relay/relay_sys.c                           \
 -      src/feature/relay/transport_config.c
 -
 -# The Directory Cache module.
 -MODULE_DIRCACHE_SOURCES = \
 -      src/feature/dircache/conscache.c        \
 -      src/feature/dircache/consdiffmgr.c      \
 -      src/feature/dircache/dircache.c         \
 -      src/feature/dircache/dirserv.c
 -
 -# The Directory Authority module.
 -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                        \
 -      src/feature/dirauth/dirvote.c                           \
 -      src/feature/dirauth/dsigs_parse.c                       \
 -      src/feature/dirauth/guardfraction.c                     \
 -      src/feature/dirauth/keypin.c                            \
 -      src/feature/dirauth/process_descs.c                     \
 -      src/feature/dirauth/reachability.c                      \
 -      src/feature/dirauth/recommend_pkg.c                     \
 -      src/feature/dirauth/shared_random.c                     \
 -      src/feature/dirauth/shared_random_state.c               \
 -      src/feature/dirauth/voteflags.c
 -
 -if BUILD_MODULE_RELAY
 -LIBTOR_APP_A_SOURCES += $(MODULE_RELAY_SOURCES)
 -else
 -LIBTOR_APP_A_STUB_SOURCES += src/feature/relay/relay_stub.c
 -endif
 -
 -if BUILD_MODULE_DIRCACHE
 -LIBTOR_APP_A_SOURCES += $(MODULE_DIRCACHE_SOURCES)
 -else
 -LIBTOR_APP_A_STUB_SOURCES += src/feature/dircache/dircache_stub.c
 -endif
 -
 -if BUILD_MODULE_DIRAUTH
 -LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
 -else
 -LIBTOR_APP_A_STUB_SOURCES += src/feature/dirauth/dirauth_stub.c
 -endif
--
  src_core_libtor_app_a_SOURCES = \
        $(LIBTOR_APP_A_SOURCES) \
        $(LIBTOR_APP_A_STUB_SOURCES)

diff --cc src/feature/dircache/include.am
index 3ff54ad64d4b0da68c8e3eb8a5bb9ffcdf5ee2e9,0000000000000000000000000000000000000000..ab162565f7f6edb886db0f19e0e4645404114a09
mode 100644,000000..100644
--- 1/src/feature/dircache/include.am
--- /dev/null
+++ b/src/feature/dircache/include.am
@@@ -1,15 -1,0 +1,21 @@@
- LIBTOR_APP_A_SOURCES +=                       \
 +
 +# ADD_C_FILE: INSERT SOURCES HERE.
++MODULE_DIRCACHE_SOURCES =                     \
 +      src/feature/dircache/conscache.c        \
 +      src/feature/dircache/consdiffmgr.c      \
 +      src/feature/dircache/dircache.c         \
 +      src/feature/dircache/dirserv.c
 +
 +# ADD_C_FILE: INSERT HEADERS HERE.
 +noinst_HEADERS +=                                     \
 +      src/feature/dircache/cached_dir_st.h            \
 +      src/feature/dircache/conscache.h                \
 +      src/feature/dircache/consdiffmgr.h              \
 +      src/feature/dircache/dircache.h                 \
 +      src/feature/dircache/dirserv.h
++
++if BUILD_MODULE_DIRCACHE
++LIBTOR_APP_A_SOURCES += $(MODULE_DIRCACHE_SOURCES)
++else
++LIBTOR_APP_A_STUB_SOURCES += src/feature/dircache/dircache_stub.c
++endif

diff --cc src/feature/dirclient/include.am
index 7e7259bc52d4af723687fe476b3c5f561ab35caa,0000000000000000000000000000000000000000..24cae9eeddfcd1f970a414fb2748e66d4a54d91c
mode 100644,000000..100644
--- 1/src/feature/dirclient/include.am
--- /dev/null
+++ b/src/feature/dirclient/include.am
@@@ -1,12 -1,0 +1,14 @@@
 +
 +# ADD_C_FILE: INSERT SOURCES HERE.
 +LIBTOR_APP_A_SOURCES +=                       \
 +      src/feature/dirclient/dirclient.c       \
++      src/feature/dirclient/dirclient_modes.c \
 +      src/feature/dirclient/dlstatus.c
 +
 +# ADD_C_FILE: INSERT HEADERS HERE.
 +noinst_HEADERS +=                                     \
 +      src/feature/dirclient/dir_server_st.h           \
 +      src/feature/dirclient/dirclient.h               \
++      src/feature/dirclient/dirclient_modes.h         \
 +      src/feature/dirclient/dlstatus.h                \
 +      src/feature/dirclient/download_status_st.h

diff --cc src/feature/nodelist/node_select.c
Simple merge

diff --cc src/feature/nodelist/routerlist.c
Simple merge

diff --cc src/test/test_config.c
Simple merge