Merge commit 'ioerror/DirFetchInfoExtraEarly'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index acc6e141b067b404abc1caa90ce75a94736214b5,94d8e8fe1a2e07fd4c256eaede607001cb200b25..5871ddfbfcf214e11400e9e6ee9781d3ec5c39ce
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -29,9 -15,35 +29,15 @@@ Changes in version 0.2.2.1-alpha - 2009
      - The memarea code now uses a sentinel value at the end of each area
        to make sure nothing writes beyond the end of an area.  This might
        help debug some conceivable causes of bug 930.
 -    - Directories that are configured with the --enable-geoip-stats flag
 -      now write their GeoIP stats to disk exactly every 24 hours.
 -    - Exit nodes can write statistics on the number of exit streams and
 -      transferred bytes per port to disk every 24 hours.  To enable this,
 -      run configure with the --enable-exit-stats option, and set
 -      "ExitPortStatistics 1" in your torrc.
 -    - Relays write statistics on how long cells spend in their circuit
 -      queues to disk every 24 hours. To enable this, run configure with
 -      the --enable-buffer-stats option, and set "CellStatistics 1" in your
 -      torrc.
 -    - Entry nodes can write statistics on the rough number and origins of
 -      connecting clients to disk every 24 hours. To enable this, run
 -      configure with the --enable-entry-stats option, and set
 -      "EntryStatistics 1" in your torrc.
 -     - Certain Tor clients (such as those behind check.torproject.org) may
 -       want to fetch the consensus in an extra early manner. To enable this
 -       a user may now set FetchDirInfoExtraEarly to 1. This also depends on
 -       setting FetchDirInfoEarly to 1. Previous behavior will stay the same
 -       as only certain clients who must have this information sooner should
 -       set this option.
 -
 -  o Minor bugfixes
 -    - Hidden service clients didn't use a cached service descriptor that
 -      was older than 15 minutes, but wouldn't fetch a new one either. Now,
 -      use a cached descriptor no matter how old it is and only fetch a new
 -      one when all introduction points fail. Fix for bug 997. Patch from
 -      Marcus Griep.
 -    - Fix refetching of hidden service descriptors when all introduction
 -      points have turned out to not work. Fixes more of bug 997.
 +    - Time and memory units in the configuration file can now be set to
 +      fractional units.  For example, "2.5 MB" is now a valid value for
 +      AccountingMax.
++    - Certain Tor clients (such as those behind check.torproject.org) may
++      want to fetch the consensus in an extra early manner. To enable this
++      a user may now set FetchDirInfoExtraEarly to 1. This also depends on
++      setting FetchDirInfoEarly to 1. Previous behavior will stay the same
++      as only certain clients who must have this information sooner should
++      set this option.
  
    o Deprecated and removed features:
      - The controller no longer accepts the old obsolete "addr-mappings/"

diff --cc src/or/config.c
Simple merge

diff --cc src/or/networkstatus.c
Simple merge

diff --cc src/or/or.h
Simple merge