From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 22 May 2009 15:56:51 +0000 (-0400)
Subject: Merge commit 'origin/maint-0.2.1'
X-Git-Tag: tor-0.2.2.1-alpha~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4201a3735f21e257494b8d523ebb19059caf4da3;p=thirdparty%2Ftor.git

Merge commit 'origin/maint-0.2.1'
---

4201a3735f21e257494b8d523ebb19059caf4da3
diff --cc ChangeLog
index 67ed89daaa,917ec9a9b0..ee9f814f5a
--- a/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