fix typo

svn:r2466

2 files changed, 13 insertions, 6 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 27d133e1ab..52e8c02412 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -397,6 +397,10 @@ int config_assign_default_dirservers(void) {
     return -1;
   }
 
+  return 0;
+}
+
+static void add_default_trusted_dirservers(void) {
   /* moria1 */
   parse_dir_server_line("18.244.0.188:9031 "
                         "FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441");
@@ -406,8 +410,6 @@ int config_assign_default_dirservers(void) {
   /* tor26 */
   parse_dir_server_line("62.116.124.106:9030 "
                         "847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D");
-
-  return 0;
 }
 
 /** Set <b>options</b> to a reasonable default.
@@ -892,9 +894,15 @@ int getconfig(int argc, char **argv, or_options_t *options) {
     }
   }
 
-  for (cl = options->DirServers; cl; cl = cl->next) {
-    if (parse_dir_server_line(cl->value)<0)
-      return -1;
+  
+  clear_trusted_dir_servers();
+  if (!options->DirServers) {
+    add_default_trusted_dirservers();
+  } else {
+    for (cl = options->DirServers; cl; cl = cl->next) {
+      if (parse_dir_server_line(cl->value)<0)
+        return -1;
+    }
   }
 
   /* XXX look at the various nicknamelists and make sure they're
diff --git a/src/or/connection.c b/src/or/connection.c
index 28c8a7a510..5f5313788f 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -198,7 +198,6 @@ void connection_about_to_close_connection(connection_t *conn)
         /* XXX We only set conn->nickname when we initiate the connection, or
          * when the handshake is complete; so conn->nickname is a good test
          * for "we initiated the connection", right? -NM */
-         */
         if(conn->nickname)
           rep_hist_note_connect_failed(conn->identity_digest, time(NULL));
       } else if (0) { // XXX reason == CLOSE_REASON_UNUSED_OR_CONN) {