Merge commit 'origin/maint-0.2.1'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 61b010a2b83a2e9f8d1d029a8233af8b218fcff0,f7da7c4cbab8f30aa485847f75a68f48dd72ab6d..1ca7af59f56bb355843a56c6dfd267af090ae792
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,44 -1,9 +1,50 @@@
 +Changes in version 0.2.2.1-alpha - 2009-??-??
 +  o Security fixes:
 +    - Fix an edge case where a malicious exit relay could convince a
 +      controller that the client's DNS question resolves to an internal IP
 +      address. Bug found and fixed by "optimist"; bugfix on 0.1.2.8-beta.
 +
 +  o Major features:
 +    - Add support for dynamic OpenSSL hardware crypto acceleration engines
 +      via new AccelName and AccelDir options.
 +
 +  o Minor features:
 +    - New --digests command-line switch to output the digests of the
 +      source files Tor was built with.
 +    - The "torify" script now uses torsocks where available.
 +    - 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.
 +
 +  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.
 +
 +  o Deprecated and removed features:
 +    - The controller no longer accepts the old obsolete "addr-mappings/"
 +      GETINFO value.
 +    - Hidden services no longer publish version 0 descriptors, and clients
 +      do not request or use version 0 descriptors. However, the authorities
 +      still accept and serve version 0 descriptors when contacted by older
 +      hidden services/clients.
 +    - The EXTENDED_EVENTS and VERBOSE_NAMES controller features are now
 +      always on; using them is necessary for correct forward-compatible
 +      controllers.
 +
 +
+ Changes in version 0.2.1.17-?? - 2009-??-??
+   o Minor bugfixes:
+     - Serve the DirPortFrontPage page even when we have been approaching
+       our quotas recently.  Fixes bug 1013; bugfix on 0.2.1.8-alpha.
+ 
+ 
  Changes in version 0.2.1.16-rc - 2009-06-20
    o Security fixes:
      - Fix an edge case where a malicious exit relay could convince a

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