torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure we have our own keys before we initialize our routerlist

Browse Source 
svn:r1535
This commit is contained in:
Nick Mathewson
2004-04-07 21:44:46 +00:00
parent 95af04cd69
commit a1ab8d2cf0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/main.c
+7 -7
View File
@@ -553,13 +553,6 @@ static int do_main_loop(void) {
int timeout;
int poll_result;
/* load the routers file */
if(options.RouterFile &&
router_set_routerlist_from_file(options.RouterFile) < 0) {
log_fn(LOG_ERR,"Error loading router list.");
return -1;
}
/* Initialize the history structures. */
rep_hist_init();
/* Intialize the service cache. */
@@ -572,6 +565,13 @@ static int do_main_loop(void) {
return -1;
}
/* load the routers file */
if(options.RouterFile &&
router_set_routerlist_from_file(options.RouterFile) < 0) {
log_fn(LOG_ERR,"Error loading router list.");
return -1;
}
if(options.DirPort) { /* the directory is already here, run startup things */
has_fetched_directory = 1;
directory_has_arrived();