diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-26 09:47:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-26 09:47:59 -0400 |
| commit | de0b07c634c45297bad794567cb44ab91988b0ca (patch) | |
| tree | 6e775cbe47029f0b56efea8746105ff367576697 /src/feature/dirclient | |
| parent | 5e5e019b31296b5a829afc4f7f3766697888b678 (diff) | |
| parent | 3a643078c1eda04e5db3e366a881b4edcf29b00a (diff) | |
| download | tor-de0b07c634c45297bad794567cb44ab91988b0ca.tar.gz tor-de0b07c634c45297bad794567cb44ab91988b0ca.zip | |
Merge branch 'router_split'
Diffstat (limited to 'src/feature/dirclient')
| -rw-r--r-- | src/feature/dirclient/dirclient.c | 7 | ||||
| -rw-r--r-- | src/feature/dirclient/dlstatus.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c index 6e8836a6dc..334012602c 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -15,8 +15,8 @@ #include "feature/client/bridges.h" #include "feature/client/entrynodes.h" #include "feature/control/control.h" +#include "feature/dirauth/authmode.h" #include "feature/dirauth/dirvote.h" -#include "feature/dirauth/mode.h" #include "feature/dirauth/shared_random.h" #include "feature/dircache/dirserv.h" #include "feature/dirclient/dirclient.h" @@ -28,14 +28,17 @@ #include "feature/hs/hs_client.h" #include "feature/hs/hs_control.h" #include "feature/nodelist/authcert.h" +#include "feature/nodelist/describe.h" #include "feature/nodelist/dirlist.h" #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/node_select.h" #include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerinfo.h" #include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerset.h" -#include "feature/relay/router.h" +#include "feature/relay/routermode.h" +#include "feature/relay/selftest.h" #include "feature/rend/rendcache.h" #include "feature/rend/rendclient.h" #include "feature/rend/rendcommon.h" diff --git a/src/feature/dirclient/dlstatus.c b/src/feature/dirclient/dlstatus.c index 017281e00c..aea17bdacb 100644 --- a/src/feature/dirclient/dlstatus.c +++ b/src/feature/dirclient/dlstatus.c @@ -11,7 +11,7 @@ #include "feature/client/entrynodes.h" #include "feature/dirclient/dlstatus.h" #include "feature/nodelist/networkstatus.h" -#include "feature/relay/router.h" +#include "feature/relay/routermode.h" #include "lib/crypt_ops/crypto_rand.h" #include "feature/dirclient/download_status_st.h" |