diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-03-26 16:41:07 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-03-26 16:41:07 +0200 |
| commit | 989b6325d671744aacec191b181e8b0b0fee35be (patch) | |
| tree | 91a802ee2d2745c2dacdbf52e00edcde3cd668a6 /src/feature/nodelist | |
| parent | e028ec6bb7a97596496cc44f21c83ff56d8d55c9 (diff) | |
| parent | b71febcea809f154f65e6e00825724b3fbeccb10 (diff) | |
| download | tor-989b6325d671744aacec191b181e8b0b0fee35be.tar.gz tor-989b6325d671744aacec191b181e8b0b0fee35be.zip | |
Merge branch 'tor-github/pr/842'
Diffstat (limited to 'src/feature/nodelist')
| -rw-r--r-- | src/feature/nodelist/dirlist.c | 2 | ||||
| -rw-r--r-- | src/feature/nodelist/networkstatus.c | 2 | ||||
| -rw-r--r-- | src/feature/nodelist/nodelist.c | 2 | ||||
| -rw-r--r-- | src/feature/nodelist/routerlist.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/feature/nodelist/dirlist.c b/src/feature/nodelist/dirlist.c index 93baa6e4e0..e2a1d6a9fa 100644 --- a/src/feature/nodelist/dirlist.c +++ b/src/feature/nodelist/dirlist.c @@ -28,7 +28,7 @@ #include "app/config/config.h" #include "core/or/policies.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/dirauth/authmode.h" #include "feature/dircommon/directory.h" #include "feature/nodelist/dirlist.h" diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 023115978c..ea9f12367f 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -58,7 +58,7 @@ #include "feature/client/bridges.h" #include "feature/client/entrynodes.h" #include "feature/client/transports.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/dirauth/reachability.h" #include "feature/dircache/consdiffmgr.h" #include "feature/dircache/dirserv.h" diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 8371d787fd..f878d47fd7 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -49,7 +49,7 @@ #include "core/or/protover.h" #include "feature/client/bridges.h" #include "feature/client/entrynodes.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/dirauth/process_descs.h" #include "feature/dircache/dirserv.h" #include "feature/hs/hs_client.h" diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index d1220f553a..48f448ad1e 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -67,7 +67,7 @@ #include "core/mainloop/mainloop.h" #include "core/or/policies.h" #include "feature/client/bridges.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/dirauth/authmode.h" #include "feature/dirauth/process_descs.h" #include "feature/dirauth/reachability.h" |