Merge commit 'origin/maint-0.2.1' into master.

Conflicts:
	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h

diff --cc ChangeLog
index 9bbb3b7d7c63bd29f464c92221fec917d0e5b370,2de570dbbc333e277618bd0310115e5d3ba19e41..8c6d7a652e749ff31e91e5fbec695cd27d75a1a9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,31 -1,16 +1,37 @@@
- Changes in version 0.2.1.15??? - ????-??-??
-   o Major bugfixes:
 +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.
 +    - 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.16-?? - 2009-??-??
+   o Minor bugfixes (on 0.2.0.x):
+     - Log correct error messages for DNS-related network errors on
+       Windows.
+ 
+ 
+ Changes in version 0.2.1.15-rc - 2009-05-25
+   o Major bugfixes (on 0.2.0.x):
      - 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.
+       occurred in certain patterns. Fix for bug 957.
  
-   o Minor bugfixes:
+   o Minor bugfixes (on 0.2.0.x):
      - 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.

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