diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-09-12 13:53:59 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-09-12 13:53:59 -0400 |
| commit | 286b129b09964bbff2bd8f5de7f4edac5f2b4827 (patch) | |
| tree | 5000eda3927ad0721bed26e61f3bb92d5bb70603 /src/feature | |
| parent | c39c9ce26ba2990177e45a4c7bffaed51d88d280 (diff) | |
| parent | c7cbe64463cba30586e53e8e5dba9596aba3c67d (diff) | |
| download | tor-286b129b09964bbff2bd8f5de7f4edac5f2b4827.tar.gz tor-286b129b09964bbff2bd8f5de7f4edac5f2b4827.zip | |
Merge branch 'tor-github/pr/1319'
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/client/entrynodes.c | 2 | ||||
| -rw-r--r-- | src/feature/control/control_cmd.c | 2 | ||||
| -rw-r--r-- | src/feature/dirauth/shared_random.c | 2 | ||||
| -rw-r--r-- | src/feature/dirauth/shared_random_state.c | 2 | ||||
| -rw-r--r-- | src/feature/hs/hs_dos.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 5b6216f483..36b575ef20 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -114,7 +114,7 @@ #include "core/or/or.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "app/config/statefile.h" #include "core/mainloop/connection.h" #include "core/mainloop/mainloop.h" diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index ad4a4ef0af..a1d7f825db 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -13,7 +13,7 @@ #include "core/or/or.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "app/main/main.h" #include "core/mainloop/connection.h" #include "core/or/circuitbuild.h" diff --git a/src/feature/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c index 5ccf1a95e5..a45f0a29c3 100644 --- a/src/feature/dirauth/shared_random.c +++ b/src/feature/dirauth/shared_random.c @@ -90,7 +90,7 @@ #include "core/or/or.h" #include "feature/dirauth/shared_random.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "feature/nodelist/networkstatus.h" diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index f2a626c738..76befb0f5f 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -12,7 +12,7 @@ #include "core/or/or.h" #include "app/config/config.h" -#include "app/config/confparse.h" +#include "lib/confmgt/confparse.h" #include "lib/crypt_ops/crypto_util.h" #include "feature/dirauth/dirvote.h" #include "feature/nodelist/networkstatus.h" diff --git a/src/feature/hs/hs_dos.c b/src/feature/hs/hs_dos.c index 0ae36017f8..19794e09d3 100644 --- a/src/feature/hs/hs_dos.c +++ b/src/feature/hs/hs_dos.c @@ -29,7 +29,7 @@ #include "lib/evloop/token_bucket.h" -#include "hs_dos.h" +#include "feature/hs/hs_dos.h" /* Default value of the allowed INTRODUCE2 cell rate per second. Above that * value per second, the introduction is denied. */ |