1 files changed, 72 insertions, 584 deletions

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 23b7304b3..890da0ad1 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -10,6 +10,7 @@
  * client or cache.
  */
 
+#define NETWORKSTATUS_PRIVATE
 #include "or.h"
 #include "channel.h"
 #include "circuitmux.h"
@@ -31,18 +32,7 @@
 #include "router.h"
 #include "routerlist.h"
 #include "routerparse.h"
-
-/* For tracking v2 networkstatus documents.  Only caches do this now. */
-
-/** Map from descriptor digest of routers listed in the v2 networkstatus
- * documents to download_status_t* */
-static digestmap_t *v2_download_status_map = NULL;
-/** Global list of all of the current v2 network_status documents that we know
- * about.  This list is kept sorted by published_on. */
-static smartlist_t *networkstatus_v2_list = NULL;
-/** True iff any member of networkstatus_v2_list has changed since the last
- * time we called download_status_map_update_from_v2_networkstatus() */
-static int networkstatus_v2_list_has_changed = 0;
+#include "transports.h"
 
 /** Map from lowercase nickname to identity digest of named server, if any. */
 static strmap_t *named_server_map = NULL;
@@ -88,11 +78,6 @@ typedef struct consensus_waiting_for_certs_t {
 static consensus_waiting_for_certs_t
        consensus_waiting_for_certs[N_CONSENSUS_FLAVORS];
 
-/** The last time we tried to download a networkstatus, or 0 for "never".  We
- * use this to rate-limit download attempts for directory caches (including
- * mirrors).  Clients don't use this now. */
-static time_t last_networkstatus_download_attempted = 0;
-
 /** A time before which we shouldn't try to replace the current consensus:
  * this will be at some point after the next consensus becomes valid, but
  * before the current consensus becomes invalid. */
@@ -107,7 +92,6 @@ static int have_warned_about_old_version = 0;
  * listed by the authorities. */
 static int have_warned_about_new_version = 0;
 
-static void download_status_map_update_from_v2_networkstatus(void);
 static void routerstatus_list_update_named_server_map(void);
 
 /** Forget that we've warned about anything networkstatus-related, so we will
@@ -131,86 +115,9 @@ void
 networkstatus_reset_download_failures(void)
 {
   int i;
-  const smartlist_t *networkstatus_v2_list = networkstatus_get_v2_list();
-  SMARTLIST_FOREACH_BEGIN(networkstatus_v2_list, networkstatus_v2_t *, ns) {
-    SMARTLIST_FOREACH_BEGIN(ns->entries, routerstatus_t *, rs) {
-         if (!router_get_by_descriptor_digest(rs->descriptor_digest))
-           rs->need_to_mirror = 1;
-    } SMARTLIST_FOREACH_END(rs);
-  } SMARTLIST_FOREACH_END(ns);
 
   for (i=0; i < N_CONSENSUS_FLAVORS; ++i)
     download_status_reset(&consensus_dl_status[i]);
-  if (v2_download_status_map) {
-    digestmap_iter_t *iter;
-    digestmap_t *map = v2_download_status_map;
-    const char *key;
-    void *val;
-    download_status_t *dls;
-    for (iter = digestmap_iter_init(map); !digestmap_iter_done(iter);
-         iter = digestmap_iter_next(map, iter) ) {
-      digestmap_iter_get(iter, &key, &val);
-      dls = val;
-      download_status_reset(dls);
-    }
-  }
-}
-
-/** Repopulate our list of network_status_t objects from the list cached on
- * disk.  Return 0 on success, -1 on failure. */
-int
-router_reload_v2_networkstatus(void)
-{
-  smartlist_t *entries;
-  struct stat st;
-  char *s;
-  char *filename = get_datadir_fname("cached-status");
-  int maybe_delete = !directory_caches_v2_dir_info(get_options());
-  time_t now = time(NULL);
-  if (!networkstatus_v2_list)
-    networkstatus_v2_list = smartlist_new();
-
-  entries = tor_listdir(filename);
-  if (!entries) { /* dir doesn't exist */
-    tor_free(filename);
-    return 0;
-  } else if (!smartlist_len(entries) && maybe_delete) {
-    rmdir(filename);
-    tor_free(filename);
-    smartlist_free(entries);
-    return 0;
-  }
-  tor_free(filename);
-  SMARTLIST_FOREACH_BEGIN(entries, const char *, fn) {
-      char buf[DIGEST_LEN];
-      if (maybe_delete) {
-        filename = get_datadir_fname2("cached-status", fn);
-        remove_file_if_very_old(filename, now);
-        tor_free(filename);
-        continue;
-      }
-      if (strlen(fn) != HEX_DIGEST_LEN ||
-          base16_decode(buf, sizeof(buf), fn, strlen(fn))) {
-        log_info(LD_DIR,
-                 "Skipping cached-status file with unexpected name \"%s\"",fn);
-        continue;
-      }
-      filename = get_datadir_fname2("cached-status", fn);
-      s = read_file_to_str(filename, 0, &st);
-      if (s) {
-        if (router_set_networkstatus_v2(s, st.st_mtime, NS_FROM_CACHE,
-                                        NULL)<0) {
-          log_warn(LD_FS, "Couldn't load networkstatus from \"%s\"",filename);
-        }
-        tor_free(s);
-      }
-      tor_free(filename);
-  } SMARTLIST_FOREACH_END(fn);
-  SMARTLIST_FOREACH(entries, char *, fn, tor_free(fn));
-  smartlist_free(entries);
-  networkstatus_v2_list_clean(time(NULL));
-  routers_update_all_from_networkstatus(time(NULL), 2);
-  return 0;
 }
 
 /** Read every cached v3 consensus networkstatus from the disk. */
@@ -277,7 +184,7 @@ router_reload_consensus_networkstatus(void)
 }
 
 /** Free all storage held by the vote_routerstatus object <b>rs</b>. */
-static void
+STATIC void
 vote_routerstatus_free(vote_routerstatus_t *rs)
 {
   vote_microdesc_hash_t *h, *next;
@@ -303,26 +210,6 @@ routerstatus_free(routerstatus_t *rs)
   tor_free(rs);
 }
 
-/** Free all storage held by the networkstatus object <b>ns</b>. */
-void
-networkstatus_v2_free(networkstatus_v2_t *ns)
-{
-  if (!ns)
-    return;
-  tor_free(ns->source_address);
-  tor_free(ns->contact);
-  if (ns->signing_key)
-    crypto_pk_free(ns->signing_key);
-  tor_free(ns->client_versions);
-  tor_free(ns->server_versions);
-  if (ns->entries) {
-    SMARTLIST_FOREACH(ns->entries, routerstatus_t *, rs,
-                      routerstatus_free(rs));
-    smartlist_free(ns->entries);
-  }
-  tor_free(ns);
-}
-
 /** Free all storage held in <b>sig</b> */
 void
 document_signature_free(document_signature_t *sig)
@@ -648,296 +535,10 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
     return -2;
 }
 
-/** Helper: return a newly allocated string containing the name of the filename
- * where we plan to cache the network status with the given identity digest. */
-char *
-networkstatus_get_cache_filename(const char *identity_digest)
-{
-  char fp[HEX_DIGEST_LEN+1];
-  base16_encode(fp, HEX_DIGEST_LEN+1, identity_digest, DIGEST_LEN);
-  return get_datadir_fname2("cached-status", fp);
-}
-
-/** Helper for smartlist_sort: Compare two networkstatus objects by
- * publication date. */
-static int
-compare_networkstatus_v2_published_on_(const void **_a, const void **_b)
-{
-  const networkstatus_v2_t *a = *_a, *b = *_b;
-  if (a->published_on < b->published_on)
-    return -1;
-  else if (a->published_on > b->published_on)
-    return 1;
-  else
-    return 0;
-}
-
-/** Add the parsed v2 networkstatus in <b>ns</b> (with original document in
- * <b>s</b>) to the disk cache (and the in-memory directory server cache) as
- * appropriate. */
-static int
-add_networkstatus_to_cache(const char *s,
-                           v2_networkstatus_source_t source,
-                           networkstatus_v2_t *ns)
-{
-  if (source != NS_FROM_CACHE) {
-    char *fn = networkstatus_get_cache_filename(ns->identity_digest);
-    if (write_str_to_file(fn, s, 0)<0) {
-      log_notice(LD_FS, "Couldn't write cached network status to \"%s\"", fn);
-    }
-    tor_free(fn);
-  }
-
-  if (directory_caches_v2_dir_info(get_options()))
-    dirserv_set_cached_networkstatus_v2(s,
-                                        ns->identity_digest,
-                                        ns->published_on);
-
-  return 0;
-}
-
 /** How far in the future do we allow a network-status to get before removing
  * it? (seconds) */
 #define NETWORKSTATUS_ALLOW_SKEW (24*60*60)
 
-/** Given a string <b>s</b> containing a network status that we received at
- * <b>arrived_at</b> from <b>source</b>, try to parse it, see if we want to
- * store it, and put it into our cache as necessary.
- *
- * If <b>source</b> is NS_FROM_DIR or NS_FROM_CACHE, do not replace our
- * own networkstatus_t (if we're an authoritative directory server).
- *
- * If <b>source</b> is NS_FROM_CACHE, do not write our networkstatus_t to the
- * cache.
- *
- * If <b>requested_fingerprints</b> is provided, it must contain a list of
- * uppercased identity fingerprints.  Do not update any networkstatus whose
- * fingerprint is not on the list; after updating a networkstatus, remove its
- * fingerprint from the list.
- *
- * Return 0 on success, -1 on failure.
- *
- * Callers should make sure that routers_update_all_from_networkstatus() is
- * invoked after this function succeeds.
- */
-int
-router_set_networkstatus_v2(const char *s, time_t arrived_at,
-                            v2_networkstatus_source_t source,
-                            smartlist_t *requested_fingerprints)
-{
-  networkstatus_v2_t *ns;
-  int i, found;
-  time_t now;
-  int skewed = 0;
-  dir_server_t *trusted_dir = NULL;
-  const char *source_desc = NULL;
-  char fp[HEX_DIGEST_LEN+1];
-  char published[ISO_TIME_LEN+1];
-
-  if (!directory_caches_v2_dir_info(get_options()))
-    return 0; /* Don't bother storing it. */
-
-  ns = networkstatus_v2_parse_from_string(s);
-  if (!ns) {
-    log_warn(LD_DIR, "Couldn't parse network status.");
-    return -1;
-  }
-  base16_encode(fp, HEX_DIGEST_LEN+1, ns->identity_digest, DIGEST_LEN);
-  if (!(trusted_dir =
-        router_get_trusteddirserver_by_digest(ns->identity_digest)) ||
-      !(trusted_dir->type & V2_DIRINFO)) {
-    log_info(LD_DIR, "Network status was signed, but not by an authoritative "
-             "directory we recognize.");
-    source_desc = fp;
-  } else {
-    source_desc = trusted_dir->description;
-  }
-  now = time(NULL);
-  if (arrived_at > now)
-    arrived_at = now;
-
-  ns->received_on = arrived_at;
-
-  format_iso_time(published, ns->published_on);
-
-  if (ns->published_on > now + NETWORKSTATUS_ALLOW_SKEW) {
-    char dbuf[64];
-    long delta = now - ns->published_on;
-    format_time_interval(dbuf, sizeof(dbuf), delta);
-    log_warn(LD_GENERAL, "Network status from %s was published %s in the "
-             "future (%s UTC). Check your time and date settings! "
-             "Not caching.",
-             source_desc, dbuf, published);
-    control_event_general_status(LOG_WARN,
-                       "CLOCK_SKEW MIN_SKEW=%ld SOURCE=NETWORKSTATUS:%s:%d",
-                       delta, ns->source_address, ns->source_dirport);
-    skewed = 1;
-  }
-
-  if (!networkstatus_v2_list)
-    networkstatus_v2_list = smartlist_new();
-
-  if ( (source == NS_FROM_DIR_BY_FP || source == NS_FROM_DIR_ALL) &&
-       router_digest_is_me(ns->identity_digest)) {
-    /* Don't replace our own networkstatus when we get it from somebody else.*/
-    networkstatus_v2_free(ns);
-    return 0;
-  }
-
-  if (requested_fingerprints) {
-    if (smartlist_contains_string(requested_fingerprints, fp)) {
-      smartlist_string_remove(requested_fingerprints, fp);
-    } else {
-      if (source != NS_FROM_DIR_ALL) {
-        char *requested =
-          smartlist_join_strings(requested_fingerprints," ",0,NULL);
-        log_warn(LD_DIR,
-               "We received a network status with a fingerprint (%s) that we "
-               "never requested. (We asked for: %s.) Dropping.",
-               fp, requested);
-        tor_free(requested);
-        return 0;
-      }
-    }
-  }
-
-  if (!trusted_dir) {
-    if (!skewed) {
-      /* We got a non-trusted networkstatus, and we're a directory cache.
-       * This means that we asked an authority, and it told us about another
-       * authority we didn't recognize. */
-      log_info(LD_DIR,
-               "We do not recognize authority (%s) but we are willing "
-               "to cache it.", fp);
-      add_networkstatus_to_cache(s, source, ns);
-      networkstatus_v2_free(ns);
-    }
-    return 0;
-  }
-
-  found = 0;
-  for (i=0; i < smartlist_len(networkstatus_v2_list); ++i) {
-    networkstatus_v2_t *old_ns = smartlist_get(networkstatus_v2_list, i);
-
-    if (tor_memeq(old_ns->identity_digest, ns->identity_digest, DIGEST_LEN)) {
-      if (tor_memeq(old_ns->networkstatus_digest,
-                  ns->networkstatus_digest, DIGEST_LEN)) {
-        /* Same one we had before. */
-        networkstatus_v2_free(ns);
-        tor_assert(trusted_dir);
-        log_info(LD_DIR,
-                 "Not replacing network-status from %s (published %s); "
-                 "we already have it.",
-                 trusted_dir->description, published);
-        if (old_ns->received_on < arrived_at) {
-          if (source != NS_FROM_CACHE) {
-            char *fn;
-            fn = networkstatus_get_cache_filename(old_ns->identity_digest);
-            /* We use mtime to tell when it arrived, so update that. */
-            touch_file(fn);
-            tor_free(fn);
-          }
-          old_ns->received_on = arrived_at;
-        }
-        download_status_failed(&trusted_dir->v2_ns_dl_status, 0);
-        return 0;
-      } else if (old_ns->published_on >= ns->published_on) {
-        char old_published[ISO_TIME_LEN+1];
-        format_iso_time(old_published, old_ns->published_on);
-        tor_assert(trusted_dir);
-        log_info(LD_DIR,
-                 "Not replacing network-status from %s (published %s);"
-                 " we have a newer one (published %s) for this authority.",
-                 trusted_dir->description, published,
-                 old_published);
-        networkstatus_v2_free(ns);
-        download_status_failed(&trusted_dir->v2_ns_dl_status, 0);
-        return 0;
-      } else {
-        networkstatus_v2_free(old_ns);
-        smartlist_set(networkstatus_v2_list, i, ns);
-        found = 1;
-        break;
-      }
-    }
-  }
-
-  if (source != NS_FROM_CACHE && trusted_dir) {
-    download_status_reset(&trusted_dir->v2_ns_dl_status);
-  }
-
-  if (!found)
-    smartlist_add(networkstatus_v2_list, ns);
-
-/** Retain any routerinfo mentioned in a V2 networkstatus for at least this
- * long. */
-#define V2_NETWORKSTATUS_ROUTER_LIFETIME (3*60*60)
-
-  {
-    time_t live_until = ns->published_on + V2_NETWORKSTATUS_ROUTER_LIFETIME;
-    SMARTLIST_FOREACH_BEGIN(ns->entries, routerstatus_t *, rs) {
-      signed_descriptor_t *sd =
-        router_get_by_descriptor_digest(rs->descriptor_digest);
-      if (sd) {
-        if (sd->last_listed_as_valid_until < live_until)
-          sd->last_listed_as_valid_until = live_until;
-      } else {
-        rs->need_to_mirror = 1;
-      }
-    } SMARTLIST_FOREACH_END(rs);
-  }
-
-  log_info(LD_DIR, "Setting networkstatus %s %s (published %s)",
-           source == NS_FROM_CACHE?"cached from":
-           ((source == NS_FROM_DIR_BY_FP || source == NS_FROM_DIR_ALL) ?
-             "downloaded from":"generated for"),
-           trusted_dir->description, published);
-  networkstatus_v2_list_has_changed = 1;
-
-  smartlist_sort(networkstatus_v2_list,
-                 compare_networkstatus_v2_published_on_);
-
-  if (!skewed)
-    add_networkstatus_to_cache(s, source, ns);
-
-  return 0;
-}
-
-/** Remove all very-old network_status_t objects from memory and from the
- * disk cache. */
-void
-networkstatus_v2_list_clean(time_t now)
-{
-  int i;
-  if (!networkstatus_v2_list)
-    return;
-
-  for (i = 0; i < smartlist_len(networkstatus_v2_list); ++i) {
-    networkstatus_v2_t *ns = smartlist_get(networkstatus_v2_list, i);
-    char *fname = NULL;
-    if (ns->published_on + MAX_NETWORKSTATUS_AGE > now)
-      continue;
-    /* Okay, this one is too old.  Remove it from the list, and delete it
-     * from the cache. */
-    smartlist_del(networkstatus_v2_list, i--);
-    fname = networkstatus_get_cache_filename(ns->identity_digest);
-    if (file_status(fname) == FN_FILE) {
-      log_info(LD_DIR, "Removing too-old networkstatus in %s", fname);
-      unlink(fname);
-    }
-    tor_free(fname);
-    if (directory_caches_v2_dir_info(get_options())) {
-      dirserv_set_cached_networkstatus_v2(NULL, ns->identity_digest, 0);
-    }
-    networkstatus_v2_free(ns);
-  }
-
-  /* And now go through the directory cache for any cached untrusted
-   * networkstatuses and other network info. */
-  dirserv_clear_old_networkstatuses(now - MAX_NETWORKSTATUS_AGE);
-  dirserv_clear_old_v1_info(now);
-}
-
 /** Helper for bsearching a list of routerstatus_t pointers: compare a
  * digest in the key to the identity digest of a routerstatus_t. */
 int
@@ -959,22 +560,6 @@ compare_digest_to_vote_routerstatus_entry(const void *_key,
   return tor_memcmp(key, vrs->status.identity_digest, DIGEST_LEN);
 }
 
-/** As networkstatus_v2_find_entry, but do not return a const pointer */
-routerstatus_t *
-networkstatus_v2_find_mutable_entry(networkstatus_v2_t *ns, const char *digest)
-{
-  return smartlist_bsearch(ns->entries, digest,
-                           compare_digest_to_routerstatus_entry);
-}
-
-/** Return the entry in <b>ns</b> for the identity digest <b>digest</b>, or
- * NULL if none was found. */
-const routerstatus_t *
-networkstatus_v2_find_entry(networkstatus_v2_t *ns, const char *digest)
-{
-  return networkstatus_v2_find_mutable_entry(ns, digest);
-}
-
 /** As networkstatus_find_entry, but do not return a const pointer */
 routerstatus_t *
 networkstatus_vote_find_mutable_entry(networkstatus_t *ns, const char *digest)
@@ -1004,15 +589,6 @@ networkstatus_vote_find_entry_idx(networkstatus_t *ns,
                                found_out);
 }
 
-/** Return a list of the v2 networkstatus documents. */
-const smartlist_t *
-networkstatus_get_v2_list(void)
-{
-  if (!networkstatus_v2_list)
-    networkstatus_v2_list = smartlist_new();
-  return networkstatus_v2_list;
-}
-
 /** As router_get_consensus_status_by_descriptor_digest, but does not return
  * a const pointer. */
 routerstatus_t *
@@ -1057,8 +633,6 @@ router_get_dl_status_by_descriptor_digest(const char *d)
   if ((rs = router_get_mutable_consensus_status_by_descriptor_digest(
                                               current_ns_consensus, d)))
     return &rs->dl_status;
-  if (v2_download_status_map)
-    return digestmap_get(v2_download_status_map, d);
 
   return NULL;
 }
@@ -1124,72 +698,6 @@ networkstatus_nickname_is_unnamed(const char *nickname)
  * networkstatus documents? */
 #define NONAUTHORITY_NS_CACHE_INTERVAL (60*60)
 
-/** We are a directory server, and so cache network_status documents.
- * Initiate downloads as needed to update them.  For v2 authorities,
- * this means asking each trusted directory for its network-status.
- * For caches, this means asking a random v2 authority for all
- * network-statuses.
- */
-static void
-update_v2_networkstatus_cache_downloads(time_t now)
-{
-  int authority = authdir_mode_v2(get_options());
-  int interval =
-    authority ? AUTHORITY_NS_CACHE_INTERVAL : NONAUTHORITY_NS_CACHE_INTERVAL;
-  const smartlist_t *trusted_dir_servers = router_get_trusted_dir_servers();
-
-  if (last_networkstatus_download_attempted + interval >= now)
-    return;
-
-  last_networkstatus_download_attempted = now;
-
-  if (authority) {
-    /* An authority launches a separate connection for everybody. */
-    SMARTLIST_FOREACH_BEGIN(trusted_dir_servers, dir_server_t *, ds)
-      {
-         char resource[HEX_DIGEST_LEN+6]; /* fp/hexdigit.z\0 */
-         tor_addr_t addr;
-         if (!(ds->type & V2_DIRINFO))
-           continue;
-         if (router_digest_is_me(ds->digest))
-           continue;
-         tor_addr_from_ipv4h(&addr, ds->addr);
-         /* Is this quite sensible with IPv6 or multiple addresses? */
-         if (connection_get_by_type_addr_port_purpose(
-                CONN_TYPE_DIR, &addr, ds->dir_port,
-                DIR_PURPOSE_FETCH_V2_NETWORKSTATUS)) {
-           /* XXX the above dir_port won't be accurate if we're
-            * doing a tunneled conn. In that case it should be or_port.
-            * How to guess from here? Maybe make the function less general
-            * and have it know that it's looking for dir conns. -RD */
-           /* Only directory caches download v2 networkstatuses, and they
-            * don't use tunneled connections.  I think it's okay to ignore
-            * this. */
-           continue;
-         }
-         strlcpy(resource, "fp/", sizeof(resource));
-         base16_encode(resource+3, sizeof(resource)-3, ds->digest, DIGEST_LEN);
-         strlcat(resource, ".z", sizeof(resource));
-         directory_initiate_command_routerstatus(
-               &ds->fake_status, DIR_PURPOSE_FETCH_V2_NETWORKSTATUS,
-               ROUTER_PURPOSE_GENERAL,
-               DIRIND_ONEHOP,
-               resource,
-               NULL, 0 /* No payload. */,
-               0 /* No I-M-S. */);
-      }
-    SMARTLIST_FOREACH_END(ds);
-  } else {
-    /* A non-authority cache launches one connection to a random authority. */
-    /* (Check whether we're currently fetching network-status objects.) */
-    if (!connection_get_by_type_purpose(CONN_TYPE_DIR,
-                                        DIR_PURPOSE_FETCH_V2_NETWORKSTATUS))
-      directory_get_from_dirserver(DIR_PURPOSE_FETCH_V2_NETWORKSTATUS,
-                                   ROUTER_PURPOSE_GENERAL, "all.z",
-                                   PDS_RETRY_IF_NO_SERVERS);
-  }
-}
-
 /** Return true iff, given the options listed in <b>options</b>, <b>flavor</b>
  *  is the flavor of a consensus networkstatus that we would like to fetch. */
 static int
@@ -1214,8 +722,6 @@ we_want_to_fetch_flavor(const or_options_t *options, int flavor)
   return flavor == usable_consensus_flavor();
 }
 
-/** How many times will we try to fetch a consensus before we give up? */
-#define CONSENSUS_NETWORKSTATUS_MAX_DL_TRIES 8
 /** How long will we hang onto a possibly live consensus for which we're
  * fetching certs before we check whether there is a better one? */
 #define DELAY_WHILE_FETCHING_CERTS (20*60)
@@ -1249,7 +755,7 @@ update_consensus_networkstatus_downloads(time_t now)
     resource = networkstatus_get_flavor_name(i);
 
     if (!download_status_is_ready(&consensus_dl_status[i], now,
-                                  CONSENSUS_NETWORKSTATUS_MAX_DL_TRIES))
+                             options->TestingConsensusMaxDownloadTries))
       continue; /* We failed downloading a consensus too recently. */
     if (connection_dir_get_by_purpose_and_resource(
                                 DIR_PURPOSE_FETCH_CONSENSUS, resource))
@@ -1324,7 +830,7 @@ update_consensus_networkstatus_fetch_time_impl(time_t now, int flav)
     if (directory_fetches_dir_info_early(options)) {
       /* We want to cache the next one at some point after this one
        * is no longer fresh... */
-      start = c->fresh_until + min_sec_before_caching;
+      start = (time_t)(c->fresh_until + min_sec_before_caching);
       /* Some clients may need the consensus sooner than others. */
       if (options->FetchDirInfoExtraEarly || authdir_mode_v3(options)) {
         dl_interval = 60;
@@ -1337,7 +843,7 @@ update_consensus_networkstatus_fetch_time_impl(time_t now, int flav)
     } else {
       /* We're an ordinary client or a bridge. Give all the caches enough
        * time to download the consensus. */
-      start = c->fresh_until + (interval*3)/4;
+      start = (time_t)(c->fresh_until + (interval*3)/4);
       /* But download the next one well before this one is expired. */
       dl_interval = ((c->valid_until - start) * 7 )/ 8;
 
@@ -1345,7 +851,7 @@ update_consensus_networkstatus_fetch_time_impl(time_t now, int flav)
        * to choose the rest of the interval *after* them. */
       if (directory_fetches_dir_info_later(options)) {
         /* Give all the *clients* enough time to download the consensus. */
-        start = start + dl_interval + min_sec_before_caching;
+        start = (time_t)(start + dl_interval + min_sec_before_caching);
         /* But try to get it before ours actually expires. */
         dl_interval = (c->valid_until - start) - min_sec_before_caching;
       }
@@ -1391,14 +897,45 @@ update_consensus_networkstatus_fetch_time(time_t now)
 
 /** Return 1 if there's a reason we shouldn't try any directory
  * fetches yet (e.g. we demand bridges and none are yet known).
- * Else return 0. */
+ * Else return 0.
+
+ * If we return 1 and <b>msg_out</b> is provided, set <b>msg_out</b>
+ * to an explanation of why directory fetches are delayed. (If we
+ * return 0, we set msg_out to NULL.)
+ */
 int
-should_delay_dir_fetches(const or_options_t *options)
+should_delay_dir_fetches(const or_options_t *options, const char **msg_out)
 {
-  if (options->UseBridges && !any_bridge_descriptors_known()) {
-    log_info(LD_DIR, "delaying dir fetches (no running bridges known)");
+  if (msg_out) {
+    *msg_out = NULL;
+  }
+
+  if (options->DisableNetwork) {
+    if (msg_out) {
+      *msg_out = "DisableNetwork is set.";
+    }
+    log_info(LD_DIR, "Delaying dir fetches (DisableNetwork is set)");
     return 1;
   }
+
+  if (options->UseBridges) {
+    if (!any_bridge_descriptors_known()) {
+      if (msg_out) {
+        *msg_out = "No running bridges";
+      }
+      log_info(LD_DIR, "Delaying dir fetches (no running bridges known)");
+      return 1;
+    }
+
+    if (pt_proxies_configuration_pending()) {
+      if (msg_out) {
+        *msg_out = "Pluggable transport proxies still configuring";
+      }
+      log_info(LD_DIR, "Delaying dir fetches (pt proxies still configuring)");
+      return 1;
+    }
+  }
+
   return 0;
 }
 
@@ -1408,10 +945,8 @@ void
 update_networkstatus_downloads(time_t now)
 {
   const or_options_t *options = get_options();
-  if (should_delay_dir_fetches(options))
+  if (should_delay_dir_fetches(options, NULL))
     return;
-  if (authdir_mode_any_main(options) || options->FetchV2Networkstatus)
-    update_v2_networkstatus_cache_downloads(now);
   update_consensus_networkstatus_downloads(now);
   update_certificate_downloads(now);
 }
@@ -1518,7 +1053,6 @@ routerstatus_has_changed(const routerstatus_t *a, const routerstatus_t *b)
          a->is_named != b->is_named ||
          a->is_unnamed != b->is_unnamed ||
          a->is_valid != b->is_valid ||
-         a->is_v2_dir != b->is_v2_dir ||
          a->is_possible_guard != b->is_possible_guard ||
          a->is_bad_exit != b->is_bad_exit ||
          a->is_bad_directory != b->is_bad_directory ||
@@ -1740,7 +1274,11 @@ networkstatus_set_current_consensus(const char *consensus,
         /* Even if we had enough signatures, we'd never use this as the
          * latest consensus. */
         if (was_waiting_for_certs && from_cache)
-          unlink(unverified_fname);
+          if (unlink(unverified_fname) != 0) {
+            log_warn(LD_FS,
+                     "Failed to unlink %s: %s",
+                     unverified_fname, strerror(errno));
+          }
       }
       goto done;
     } else {
@@ -1750,8 +1288,13 @@ networkstatus_set_current_consensus(const char *consensus,
                  "consensus");
         result = -2;
       }
-      if (was_waiting_for_certs && (r < -1) && from_cache)
-        unlink(unverified_fname);
+      if (was_waiting_for_certs && (r < -1) && from_cache) {
+        if (unlink(unverified_fname) != 0) {
+            log_warn(LD_FS,
+                     "Failed to unlink %s: %s",
+                     unverified_fname, strerror(errno));
+        }
+      }
       goto done;
     }
   }
@@ -1799,7 +1342,11 @@ networkstatus_set_current_consensus(const char *consensus,
       waiting->body = NULL;
     waiting->set_at = 0;
     waiting->dl_failed = 0;
-    unlink(unverified_fname);
+    if (unlink(unverified_fname) != 0) {
+      log_warn(LD_FS,
+               "Failed to unlink %s: %s",
+               unverified_fname, strerror(errno));
+    }
   }
 
   /* Reset the failure count only if this consensus is actually valid. */
@@ -1835,7 +1382,8 @@ networkstatus_set_current_consensus(const char *consensus,
      * current consensus really alter our view of any OR's rate limits? */
     connection_or_update_token_buckets(get_connection_array(), options);
 
-    circuit_build_times_new_consensus_params(&circ_times, current_consensus);
+    circuit_build_times_new_consensus_params(get_circuit_build_times_mutable(),
+        current_consensus);
   }
 
   if (directory_caches_dir_info(options)) {
@@ -1912,9 +1460,6 @@ routers_update_all_from_networkstatus(time_t now, int dir_version)
   networkstatus_t *consensus = networkstatus_get_reasonably_live_consensus(now,
                                                                      FLAV_NS);
 
-  if (networkstatus_v2_list_has_changed)
-    download_status_map_update_from_v2_networkstatus();
-
   if (!consensus || dir_version < 3) /* nothing more we should do */
     return;
 
@@ -1969,35 +1514,6 @@ routers_update_all_from_networkstatus(time_t now, int dir_version)
   }
 }
 
-/** Update v2_download_status_map to contain an entry for every router
- * descriptor listed in the v2 networkstatuses. */
-static void
-download_status_map_update_from_v2_networkstatus(void)
-{
-  digestmap_t *dl_status;
-  if (!networkstatus_v2_list)
-    return;
-  if (!v2_download_status_map)
-    v2_download_status_map = digestmap_new();
-
-  dl_status = digestmap_new();
-  SMARTLIST_FOREACH_BEGIN(networkstatus_v2_list, networkstatus_v2_t *, ns) {
-    SMARTLIST_FOREACH_BEGIN(ns->entries, const routerstatus_t *, rs) {
-      const char *d = rs->descriptor_digest;
-      download_status_t *s;
-      if (digestmap_get(dl_status, d))
-        continue;
-      if (!(s = digestmap_remove(v2_download_status_map, d))) {
-        s = tor_malloc_zero(sizeof(download_status_t));
-      }
-      digestmap_set(dl_status, d, s);
-    } SMARTLIST_FOREACH_END(rs);
-  } SMARTLIST_FOREACH_END(ns);
-  digestmap_free(v2_download_status_map, tor_free_);
-  v2_download_status_map = dl_status;
-  networkstatus_v2_list_has_changed = 0;
-}
-
 /** Update our view of the list of named servers from the most recently
  * retrieved networkstatus consensus. */
 static void
@@ -2029,14 +1545,11 @@ void
 routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
                                                    int reset_failures)
 {
-  dir_server_t *ds;
   const or_options_t *options = get_options();
-  int authdir = authdir_mode_v2(options) || authdir_mode_v3(options);
+  int authdir = authdir_mode_v3(options);
   networkstatus_t *ns = current_consensus;
   if (!ns || !smartlist_len(ns->routerstatus_list))
     return;
-  if (!networkstatus_v2_list)
-    networkstatus_v2_list = smartlist_new();
 
   routers_sort_by_identity(routers);
 
@@ -2046,11 +1559,6 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
                                router->cache_info.identity_digest, DIGEST_LEN),
   {
   }) {
-    /* We have a routerstatus for this router. */
-    const char *digest = router->cache_info.identity_digest;
-
-    ds = router_get_fallback_dirserver_by_digest(digest);
-
     /* Is it the same descriptor, or only the same identity? */
     if (tor_memeq(router->cache_info.signed_descriptor_digest,
                 rs->descriptor_digest, DIGEST_LEN)) {
@@ -2068,30 +1576,11 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
           dirserv_should_launch_reachability_test(router, old_router);
       }
     }
-    if (rs->is_flagged_running && ds) {
-      download_status_reset(&ds->v2_ns_dl_status);
-    }
     if (reset_failures) {
       download_status_reset(&rs->dl_status);
     }
   } SMARTLIST_FOREACH_JOIN_END(rs, router);
 
-  /* Now update last_listed_as_valid_until from v2 networkstatuses. */
-  SMARTLIST_FOREACH_BEGIN(networkstatus_v2_list, networkstatus_v2_t *, ns) {
-    time_t live_until = ns->published_on + V2_NETWORKSTATUS_ROUTER_LIFETIME;
-    SMARTLIST_FOREACH_JOIN(ns->entries, const routerstatus_t *, rs,
-                         routers, routerinfo_t *, ri,
-                         tor_memcmp(rs->identity_digest,
-                                ri->cache_info.identity_digest, DIGEST_LEN),
-                         STMT_NIL) {
-      if (tor_memeq(ri->cache_info.signed_descriptor_digest,
-                  rs->descriptor_digest, DIGEST_LEN)) {
-        if (live_until > ri->cache_info.last_listed_as_valid_until)
-          ri->cache_info.last_listed_as_valid_until = live_until;
-      }
-    } SMARTLIST_FOREACH_JOIN_END(rs, ri);
-  } SMARTLIST_FOREACH_END(ns);
-
   router_dir_info_changed();
 }
 
@@ -2183,9 +1672,17 @@ networkstatus_dump_bridge_status_to_file(time_t now)
   char *status = networkstatus_getinfo_by_purpose("bridge", now);
   const or_options_t *options = get_options();
   char *fname = NULL;
+  char *thresholds = NULL, *thresholds_and_status = NULL;
+  routerlist_t *rl = router_get_routerlist();
+  dirserv_compute_bridge_flag_thresholds(rl);
+  thresholds = dirserv_get_flag_thresholds_line();
+  tor_asprintf(&thresholds_and_status, "flag-thresholds %s\n%s",
+               thresholds, status);
   tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges",
                options->DataDirectory);
-  write_str_to_file(fname,status,0);
+  write_str_to_file(fname,thresholds_and_status,0);
+  tor_free(thresholds);
+  tor_free(thresholds_and_status);
   tor_free(fname);
   tor_free(status);
 }
@@ -2402,15 +1899,6 @@ void
 networkstatus_free_all(void)
 {
   int i;
-  if (networkstatus_v2_list) {
-    SMARTLIST_FOREACH(networkstatus_v2_list, networkstatus_v2_t *, ns,
-                      networkstatus_v2_free(ns));
-    smartlist_free(networkstatus_v2_list);
-    networkstatus_v2_list = NULL;
-  }
-
-  digestmap_free(v2_download_status_map, tor_free_);
-  v2_download_status_map = NULL;
   networkstatus_vote_free(current_ns_consensus);
   networkstatus_vote_free(current_md_consensus);
   current_md_consensus = current_ns_consensus = NULL;