diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:50:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:50:18 -0400 |
| commit | c3b72583709332f051fb61e17f5102d0ada05917 (patch) | |
| tree | a686097afdcda0074eb00d7b6e667abf91dc19e5 /src/or/dirauth | |
| parent | 94c6eb7d7f023e50071632e618f003409e5e6489 (diff) | |
| parent | 94dcd38a1430061a0bb630ad680a41a78262a55c (diff) | |
| download | tor-c3b72583709332f051fb61e17f5102d0ada05917.tar.gz tor-c3b72583709332f051fb61e17f5102d0ada05917.zip | |
Merge remote-tracking branch 'isis/bug24660_r1'
Diffstat (limited to 'src/or/dirauth')
| -rw-r--r-- | src/or/dirauth/shared_random.c | 6 | ||||
| -rw-r--r-- | src/or/dirauth/shared_random_state.c | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/or/dirauth/shared_random.c b/src/or/dirauth/shared_random.c index 0a89fa8d2d..6dd1f330e0 100644 --- a/src/or/dirauth/shared_random.c +++ b/src/or/dirauth/shared_random.c @@ -91,12 +91,14 @@ #include "shared_random.h" #include "config.h" #include "confparse.h" +#include "crypto_rand.h" +#include "crypto_util.h" #include "networkstatus.h" -#include "routerkeys.h" #include "router.h" +#include "routerkeys.h" #include "routerlist.h" -#include "shared_random_state.h" #include "shared_random_client.h" +#include "shared_random_state.h" #include "util.h" #include "voting_schedule.h" diff --git a/src/or/dirauth/shared_random_state.c b/src/or/dirauth/shared_random_state.c index 56c12c8c72..245fb99ce7 100644 --- a/src/or/dirauth/shared_random_state.c +++ b/src/or/dirauth/shared_random_state.c @@ -11,16 +11,16 @@ #define SHARED_RANDOM_STATE_PRIVATE #include "or.h" -#include "shared_random.h" #include "config.h" #include "confparse.h" -#include "voting_schedule.h" +#include "crypto_util.h" +#include "dirauth/dirvote.h" #include "networkstatus.h" #include "router.h" -#include "shared_random_state.h" +#include "shared_random.h" #include "shared_random_client.h" - -#include "dirauth/dirvote.h" +#include "shared_random_state.h" +#include "voting_schedule.h" /* Default filename of the shared random state on disk. */ static const char default_fname[] = "sr-state"; |