Merge commit 'origin/maint-0.2.1'

diff --cc ChangeLog
index 67ed89daaa7a655c8d73b10e1322b2b58c9979a4,917ec9a9b05f29846cdb5d6d1e6071488f7e1d88..ee9f814f5a86dd83a245b388426bf0d1c38803a9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,9 +1,27 @@@
 +Changes in version 0.2.2.1-alpha - 2009-??-??
 +  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.
 +
 +  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.
 +
 +
  Changes in version 0.2.1.15??? - ????-??-??
+   o Major bugfixes:
+     - Fix a timing-dependent, allocator-dependent, DNS-related crash bug
+       that would occur on some exit nodes when DNS failures and timeouts
+       occurred in certain patterns.  Fix for bug 957.
+ 
    o Minor bugfixes:
      - Actually return -1 in the error case for read_bandwidth_usage().
        Harmless bug, since we currently don't care about the return value

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