[or-cvs] Make sure we have our own keys before we initialize our rou...

[Nick Mathewson]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv5753/src/or

Modified Files:
	main.c 
Log Message:
Make sure we have our own keys before we initialize our routerlist

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- main.c	7 Apr 2004 20:47:50 -0000	1.226
+++ main.c	7 Apr 2004 21:44:46 -0000	1.227
@@ -553,13 +553,6 @@
   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 @@
     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();