diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-01 10:29:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-01 10:29:05 -0400 |
| commit | d018bf199c9e566202eef0bb7fb68c2567c4a25e (patch) | |
| tree | 83b81729b2c25a21bd2ef61e9350667d2fa56d7e /src/or/config.c | |
| parent | 4cf6b67f5e83e1a26b4b2fbdb3b169c137a30687 (diff) | |
| parent | d8509b450a1de815399a42b5df8c6b25789429c7 (diff) | |
| download | tor-d018bf199c9e566202eef0bb7fb68c2567c4a25e.tar.gz tor-d018bf199c9e566202eef0bb7fb68c2567c4a25e.zip | |
Merge remote-tracking branch 'dgoulet/ticket25610_034_01-squashed'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 54f3930fc5..3719ac8847 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -79,7 +79,6 @@ #include "confparse.h" #include "cpuworker.h" #include "dirserv.h" -#include "dirvote.h" #include "dns.h" #include "dos.h" #include "entrynodes.h" @@ -110,6 +109,8 @@ #include "procmon.h" +#include "dirauth/dirvote.h" + #ifdef HAVE_SYSTEMD # if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) /* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse |