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/dircache | |
parent | 5e5e019b31296b5a829afc4f7f3766697888b678 (diff) | |
parent | 3a643078c1eda04e5db3e366a881b4edcf29b00a (diff) | |
download | tor-de0b07c634c45297bad794567cb44ab91988b0ca.tar.gz tor-de0b07c634c45297bad794567cb44ab91988b0ca.zip |
Merge branch 'router_split'
Diffstat (limited to 'src/feature/dircache')
-rw-r--r-- | src/feature/dircache/dircache.c | 4 | ||||
-rw-r--r-- | src/feature/dircache/dirserv.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index 7bfc539829..76bde0b787 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -11,7 +11,7 @@ #include "core/mainloop/connection.h" #include "core/or/relay.h" #include "feature/dirauth/dirvote.h" -#include "feature/dirauth/mode.h" +#include "feature/dirauth/authmode.h" #include "feature/dirauth/process_descs.h" #include "feature/dircache/conscache.h" #include "feature/dircache/consdiffmgr.h" @@ -23,7 +23,7 @@ #include "feature/nodelist/authcert.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/routerlist.h" -#include "feature/relay/router.h" +#include "feature/relay/routermode.h" #include "feature/rend/rendcache.h" #include "feature/stats/geoip.h" #include "feature/stats/rephist.h" diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 65c3d6d91a..4fa3cd7f93 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -15,6 +15,7 @@ #include "feature/nodelist/microdesc.h" #include "feature/nodelist/routerlist.h" #include "feature/relay/router.h" +#include "feature/relay/routermode.h" #include "feature/stats/rephist.h" #include "feature/dircache/cached_dir_st.h" |