Merge branch 'maint-0.2.1'

diff --cc ChangeLog
index 5b9aa3c06fefc25e4378a56ec98458ff43c09391,994ff4c7b35517af614c9a67fe9980b35b6c9e77..a5cee13c4ff7aaafc3b34b399de74d4bec58a319
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,58 -1,12 +1,66 @@@
 +Changes in version 0.2.2.1-alpha - 2009-0?-??
 +  o Major features:
 +    - Add support for dynamic OpenSSL hardware crypto acceleration engines
 +      via new AccelName and AccelDir options.
 +
 +  o New options for gathering stats safely:
 +    - Directories that configure with --enable-dirreq-stats and set
 +      "DirReqStatistics 1" write directory request stats to disk every
 +      24 hours. As compared to the --enable-geoip-stats flag in 0.2.1.x,
 +      there are a few improvements: 1) stats are written to disk exactly
 +      every 24 hours; 2) estimated shares of v2 and v3 requests are
 +      determined as mean values, not at the end of a measurement period;
 +      3) unresolved requests are listed with country code '??';
 +      4) directories also measure download times.
 +    - Exit nodes that configure with --enable-exit-stats and set
 +      "ExitPortStatistics 1" write statistics on the number of exit
 +      streams and transferred bytes per port to disk every 24 hours.
 +    - Relays that configure with --enable-buffer-stats and set
 +      "CellStatistics 1" write statistics to disk every 24 hours on how
 +      long cells spend in their circuit queues.
 +    - Entry nodes that configure with --enable-entry-stats and set
 +      "EntryStatistics 1" write statistics to disk every 24 hours on
 +      the rough number and origins of connecting clients.
 +
 +  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.
 +    - Time and memory units in the configuration file can now be set to
 +      fractional units.  For example, "2.5 MB" is now a valid value for
 +      AccountingMax.
 +    - Certain Tor clients (such as those behind check.torproject.org) may
 +      want to fetch the consensus in an extra early manner. To enable this
 +      a user may now set FetchDirInfoExtraEarly to 1. This also depends on
 +      setting FetchDirInfoEarly to 1. Previous behavior will stay the same
 +      as only certain clients who must have this information sooner should
 +      set this option.
 +
 +  o Deprecated and removed features:
 +    - The controller no longer accepts the old obsolete "addr-mappings/"
 +      or "unregistered-servers-" GETINFO values.
 +    - 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.
 +    - Removal of support for .noconnect style addresses.
 +
 +
  Changes in version 0.2.1.20 - 2009-??-??
+   o Major bugfixes:
+     - Send circuit or stream sendme cells when our window has decreased
+       by 100 cells, not when it has decreased by 101 cells. Bug uncovered
+       by Karsten when testing the "reduce circuit window" performance
+       patch. Bugfix on the 54th commit on Tor -- from July 2002,
+       before the release of Tor 0.0.0. This is the new winner of the
+       oldest-bug prize.
+ 
    o New directory authorities:
      - Set up urras (run by Jacob Appelbaum) as the seventh v3 directory
        authority.

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