Merge branch 'maint-0.2.1'

diff --cc ChangeLog
index b84a3d947ab9ca5bbbafbbe64c93adc46c887d43,b7a4db140409d2e2ae3097c8d9581568e4df7c22..b37f45bc424bc018f92cb563ce4e78cd72de885b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,8 +1,26 @@@
 +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 Minor bugfixes:
-     - Actually return -1 in the error case for read_bandwidth_usage. Bug
-       was harmless, we currently don't care for the return value anywhere.
-       Bugfix on 0.2.0.9-alpha.
+     - Actually return -1 in the error case for read_bandwidth_usage().
+       Harmless bug, since we currently don't care about the return value
+       anywhere. Bugfix on 0.2.0.9-alpha.
      - Provide a more useful log message if bug 977 (related to buffer
        freelists) ever reappears, and do not crash right away.
      - Protect the count of open sockets with a mutex, so we can't