diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:57:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:57:37 -0500 |
| commit | 3c89622e39d964b731a40c6a705327d5caa07be4 (patch) | |
| tree | fd7e30579398838eea9a58eb48964c95f7298099 /src/feature/dirclient/include.am | |
| parent | 5e70c27e8560ac1885ae9d9e1b79d3838b49cc09 (diff) | |
| parent | efb301c86c288c01e21dfb5da9f685f33341b2c2 (diff) | |
| download | tor-3c89622e39d964b731a40c6a705327d5caa07be4.tar.gz tor-3c89622e39d964b731a40c6a705327d5caa07be4.zip | |
Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged
Resolved conflicts in src/core/include.am
Diffstat (limited to 'src/feature/dirclient/include.am')
| -rw-r--r-- | src/feature/dirclient/include.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/feature/dirclient/include.am b/src/feature/dirclient/include.am index 7e7259bc52..24cae9eedd 100644 --- a/src/feature/dirclient/include.am +++ b/src/feature/dirclient/include.am @@ -2,11 +2,13 @@ # 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 |