Merge remote branch 'origin/maint-0.2.1'

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

1 files changed, 27 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 92e1ec1e5..6ec19e652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,7 +53,17 @@ Changes in version 0.2.2.8-alpha - 2010-01-26
       refuse to listen.
 
 
-Changes in version 0.2.1.23 - 2010-0?-??
+Changes in version 0.2.1.24 - 2010-??-??
+  o Minor bugfixes:
+    - Work correctly out-of-the-box with even more vendor-patched versions
+      of OpenSSL.
+
+
+Changes in version 0.2.1.23 - 2010-02-13
+  Tor 0.2.1.23 fixes a huge client-side performance bug, makes Tor work
+  again on the latest OS X, and updates the location of a directory
+  authority.
+
   o Major bugfixes (performance):
     - We were selecting our guards uniformly at random, and then weighting
       which of our guards we'd use uniformly at random. This imbalance
@@ -64,20 +74,25 @@ Changes in version 0.2.1.23 - 2010-0?-??
       bug 1217; bugfix on 0.2.1.3-alpha. Found by Mike Perry.
 
   o Major bugfixes:
+    - Make Tor work again on the latest OS X: when deciding whether to
+      use strange flags to turn TLS renegotiation on, detect the OpenSSL
+      version at run-time, not compile time. We need to do this because
+      Apple doesn't update its dev-tools headers when it updates its
+      libraries in a security patch.
     - Fix a potential buffer overflow in lookup_last_hid_serv_request()
-     that could happen on 32-bit platforms with 64-bit time_t. Also fix
-     a memory leak when requesting a hidden service descriptor we've
-     requested before. Fixes bug 1242, bugfix on 0.2.0.18-alpha. Found
-     by aakova.
+      that could happen on 32-bit platforms with 64-bit time_t. Also fix
+      a memory leak when requesting a hidden service descriptor we've
+      requested before. Fixes bug 1242, bugfix on 0.2.0.18-alpha. Found
+      by aakova.
+
+  o Directory authority changes:
+    - Change IP address for dannenberg (v3 directory authority), and
+      remove moria2 (obsolete v1, v2 directory authority and v0 hidden
+      service directory authority) from the list.
 
   o Minor bugfixes:
-    - When deciding whether to use strange flags to turn TLS renegotiation
-      on, detect the OpenSSL version at run-time, not compile time.  We
-      need to do this because Apple doesn't update its dev-tools headers
-      when it updates its libraries in a security patch.
-    - Refactor resolve_my_address() a little, to not use gethostbyname()
-      anymore. Fixes bug 1244; bugfix on 0.0.2pre25. Reported by Mike
-      Mestnik.
+    - Refactor resolve_my_address() to not use gethostbyname() anymore.
+      Fixes bug 1244; bugfix on 0.0.2pre25. Reported by Mike Mestnik.
 
   o Minor features:
     - Avoid a mad rush at the beginning of each month when each client