Merge branch 'maint-0.2.1' into master

diff --cc ChangeLog
index 5871ddfbfcf214e11400e9e6ee9781d3ec5c39ce,ed76e22f955aed47860d81ede51212bc2a63f92f..1465407ce74f92293ab4339c6f8717d6d9f314c0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,56 -1,24 +1,77 @@@
- Changes in version 0.2.2.1-alpha - 2009-07-2?
++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.
 +
 +
+ Changes in version 0.2.1.19 - 2009-07-28
+   o Major bugfixes:
+     - Make accessing hidden services on 0.2.1.x work right
+       again. Bugfix on 0.2.1.3-alpha; workaround for bug 1038.
+ 
+   o Minor features:
+     - When a relay/bridge is writing out its identity key fingerprint to
+       the "fingerprint" file and to its logs, write it without spaces. Now
+       it will look like the fingerprints in our bridges documentation,
+       and confuse fewer users.
+ 
+   o Minor bugfixes:
+     - Relays no longer publish a new server descriptor if they change
+       their MaxAdvertisedBandwidth config option but it doesn't end up
+       changing their advertised bandwidth numbers. Bugfix on 0.2.0.28-rc;
+       fixes bug 1026. Patch from Sebastian.
+     - Avoid leaking memory every time we get a create cell but we have
+       so many already queued that we refuse it. Bugfix on 0.2.0.19-alpha;
+       fixes bug 1034. Reported by BarkerJr.
+ 
+ 
  Changes in version 0.2.1.18 - 2009-07-24
    o Build fixes:
      - Add LIBS=-lrt to Makefile.am so the Tor RPMs use a static libevent.

diff --cc doc/spec/tor-spec.txt
Simple merge

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

diff --cc src/or/or.h
index be72750a7bd345f76a0a0b2ab4e110745623b674,1dcff28d6d22a5e4f462865c9d8daff508f8c870..65b582fd83e1f604522dad8eb8dce17b14b275a5
--- 1/src/or/or.h
--- 2/src/or/or.h
+++ b/src/or/or.h
@@@ -2947,7 -2926,8 +2952,9 @@@ int options_need_geoip_info(or_options_
  int getinfo_helper_config(control_connection_t *conn,
                            const char *question, char **answer);
  
 +const char *tor_get_digests(void);
+ int get_effective_bwrate(or_options_t *options);
+ int get_effective_bwburst(or_options_t *options);
  
  #ifdef CONFIG_PRIVATE
  /* Used only by config.c and test.c */

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

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

diff --cc src/win32/orconfig.h
index 08e601456b460eec01003e049d4f5c355477e6a0,03e615850ff34e85c86a0204205d130d0e6b25e3..563d79548d98864d738666ac8542f10737c2fd2a
--- 1/src/win32/orconfig.h
--- 2/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@@ -226,6 -226,6 +226,5 @@@
  #define USING_TWOS_COMPLEMENT
  
  /* Version number of package */
 -#define VERSION "0.2.1.19"
 -
 +#define VERSION "0.2.2.0-alpha-dev"
  
-