Merge branch 'maint-0.2.1'

Resolved conflict in
	src/or/networkstatus.c

diff --cc src/or/networkstatus.c
index 0ec69cb29b66daed8fdc237ecf7035c5b22b038a,4721420bbd2b0e6f1e2200a8ad4ade8683c86f02..c0a3a28e4baa1894fa9dc93670b605a414364dac
--- 1/src/or/networkstatus.c
--- 2/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@@ -1234,14 -1146,9 +1244,16 @@@ update_consensus_networkstatus_fetch_ti
      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 + CONSENSUS_MIN_SECONDS_BEFORE_CACHING;
+       start = c->fresh_until + min_sec_before_caching;
 -      /* But only in the first half-interval after that. */
 -      dl_interval = interval/2;
 +      /* Some clients may need the consensus sooner than others. */
 +      if (options->FetchDirInfoExtraEarly) {
 +        dl_interval = 60;
++        if (min_sec_before_caching + dl_interval > interval)
++          dl_interval = interval/2;
 +      } else {
 +        /* But only in the first half-interval after that. */
 +        dl_interval = interval/2;
 +      }
      } else {
        /* We're an ordinary client or a bridge. Give all the caches enough
         * time to download the consensus. */