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/rend | |
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/rend')
-rw-r--r-- | src/feature/rend/rendclient.c | 2 | ||||
-rw-r--r-- | src/feature/rend/rendcommon.c | 2 | ||||
-rw-r--r-- | src/feature/rend/rendservice.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 4ca783c7c3..5a8b234544 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -17,7 +17,7 @@ #include "core/or/connection_edge.h" #include "core/or/relay.h" #include "feature/client/circpathbias.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/dirclient/dirclient.h" #include "feature/dircommon/directory.h" #include "feature/hs/hs_circuit.h" diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c index 5cc054f454..777de2984c 100644 --- a/src/feature/rend/rendcommon.c +++ b/src/feature/rend/rendcommon.c @@ -15,7 +15,7 @@ #include "core/or/circuitlist.h" #include "core/or/circuituse.h" #include "app/config/config.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "feature/hs/hs_client.h" diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 73edcaccf5..57475a64b0 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -19,7 +19,7 @@ #include "core/or/policies.h" #include "core/or/relay.h" #include "feature/client/circpathbias.h" -#include "feature/control/control.h" +#include "feature/control/control_events.h" #include "feature/dirclient/dirclient.h" #include "feature/dircommon/directory.h" #include "feature/hs/hs_common.h" |