on HUP, retry OR connections, and stop clobbering the dirserver's routerlist

svn:r920

1 files changed, 3 insertions, 6 deletions

diff --git a/src/or/main.c b/src/or/main.c
index f630a8a409..bde0f6b06f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -481,7 +481,9 @@ static int do_main_loop(void) {
         /* no need to provide argc/v, they've been cached inside init_from_config */
         exit(1);
       }
-
+      if(options.ORPort) {
+        router_retry_connections();
+      }
       if(options.DirPort) {
         /* reload the fingerprint file */
         char keydir[512];
@@ -490,11 +492,6 @@ static int do_main_loop(void) {
         if(dirserv_parse_fingerprint_file(keydir) < 0) {
           log_fn(LOG_WARN, "Error reloading fingerprints. Continuing with old list.");
         }
-
-        /* XXX do we really want to be resetting the routerlist here? */
-        if(router_set_routerlist_from_file(options.RouterFile) < 0) {
-          log(LOG_WARN,"Error reloading router list. Continuing with old list.");
-        }
       } else {
         /* fetch a new directory */
         directory_initiate_command(router_pick_directory_server(), DIR_CONN_STATE_CONNECTING_FETCH);