Merge branch 'bug18809_028_squashed' into maint-0.2.8

1 files changed, 1 insertions, 12 deletions

diff --git a/src/or/main.c b/src/or/main.c
index 86fb2bd46d..b9fee1d480 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1484,17 +1484,6 @@ run_scheduled_events(time_t now)
     dirvote_act(options, now);
   }
 
-  /* 2d. Cleanup excess consensus bootstrap connections every second.
-   * connection_dir_close_consensus_conn_if_extra() closes some connections
-   * that are clearly excess, but this check is more thorough.
-   * This only closes connections if there is more than one consensus
-   * connection, and at least one of those connections is already downloading
-   * (during bootstrap), or connecting (just after the bootstrap consensus is
-   * downloaded).
-   * It won't close any consensus connections initiated after bootstrap,
-   * because those attempts are made one at a time. */
-  connection_dir_close_extra_consensus_conns();
-
   /* 3a. Every second, we examine pending circuits and prune the
    *    ones which have been pending for more than a few seconds.
    *    We do this before step 4, so it can try building more if
@@ -1917,7 +1906,7 @@ fetch_networkstatus_callback(time_t now, const or_options_t *options)
 
   /* How often do we check whether we should download network status
    * documents? */
-  const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping(
+  const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping(
                                                                         now);
   const int prefer_mirrors = !directory_fetches_from_authorities(
                                                               get_options());