diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:15:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:15:40 -0400 |
| commit | d6b2af7a3aba24cf3d77587c41028aad70d59605 (patch) | |
| tree | a6d8687d4055a9e27fbcb406cfb518295469bf0c /src/or/dirserv.c | |
| parent | c274f825da18f33f12eb78260d1c78d5f685d959 (diff) | |
| parent | e80a032b61e3c793ad0d1627074b8750f7cfec48 (diff) | |
| download | tor-d6b2af7a3aba24cf3d77587c41028aad70d59605.tar.gz tor-d6b2af7a3aba24cf3d77587c41028aad70d59605.zip | |
Merge branch 'bug19180_easy_squashed'
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ad476c582a..fa698701c3 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -19,6 +19,7 @@ #include "dirvote.h" #include "hibernate.h" #include "keypin.h" +#include "main.h" #include "microdesc.h" #include "networkstatus.h" #include "nodelist.h" @@ -44,10 +45,6 @@ * directory authorities. */ #define MAX_UNTRUSTED_NETWORKSTATUSES 16 -extern time_t time_of_process_start; /* from main.c */ - -extern long stats_n_seconds_working; /* from main.c */ - /** Total number of routers with measured bandwidth; this is set by * dirserv_count_measured_bws() before the loop in * dirserv_generate_networkstatus_vote_obj() and checked by |