Merge commit 'origin/maint-0.2.1'

diff --cc ChangeLog
index 4d43e7a6f3fa6fdbaa22dae760648b0289ea1191,bce2aa39d94dc6471edc50c43287b2d8aee4093d..cdd96de4aa360686d32eed270ce71b6beec9d61e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,36 -1,9 +1,41 @@@
 +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 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.16-?? - 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 performance improvements (on 0.2.0.x):
      - Disable and refactor some debugging checks that forced a linear scan
        over the whole server-side DNS cache.  These accounted for over 50%

diff --cc tor.spec.in
Simple merge