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/main.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/main.c')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index f1b8308304..1160f377e4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -72,7 +72,6 @@ #include "crypto_s2k.h" #include "directory.h" #include "dirserv.h" -#include "dirvote.h" #include "dns.h" #include "dnsserv.h" #include "dos.h" @@ -103,7 +102,7 @@ #include "routerlist.h" #include "routerparse.h" #include "scheduler.h" -#include "shared_random.h" +#include "dirauth/shared_random.h" #include "statefile.h" #include "status.h" #include "tor_api.h" @@ -118,6 +117,8 @@ #include <event2/event.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 |