From a1ab8d2cf0878d97f09d3bc17b53511cd9c2d4c1 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Apr 2004 21:44:46 +0000
Subject: [PATCH] Make sure we have our own keys before we initialize our
 routerlist

svn:r1535
---
 trunk/src/or/main.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/trunk/src/or/main.c b/trunk/src/or/main.c
index afe3566fb9..0842a1c50a 100644
--- a/trunk/src/or/main.c
+++ b/trunk/src/or/main.c
@@ -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();