Merge remote branch 'origin/maint-0.2.1'

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

3 files changed, 38 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 84a97c942..d121f220a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -391,11 +391,16 @@ Changes in version 0.2.2.1-alpha - 2009-08-26
       occurred with the upgrade to Vidalia 0.2.3.
 
 
-Changes in Version 0.2.1.21 - 20??-??-??
+Changes in version 0.2.1.21 - 2009-12-21
+  Tor 0.2.1.21 fixes an incompatibility with the most recent OpenSSL
+  library. If you use Tor on Linux / Unix and you're getting SSL
+  renegotiation errors, upgrading should help. We also recommend an
+  upgrade if you're an exit relay.
+
   o Major bugfixes:
     - Work around a security feature in OpenSSL 0.9.8l that prevents our
-      handshake from working unless we explicitly tell OpenSSL that we are
-      using SSL renegotiation safely.  We are, of course, but OpenSSL
+      handshake from working unless we explicitly tell OpenSSL that we
+      are using SSL renegotiation safely. We are, of course, but OpenSSL
       0.9.8l won't work unless we say we are.
     - Avoid crashing if the client is trying to upload many bytes and the
       circuit gets torn down at the same time, or if the flip side
@@ -403,14 +408,14 @@ Changes in Version 0.2.1.21 - 20??-??-??
 
   o Minor bugfixes:
     - Do not refuse to learn about authority certs and v2 networkstatus
-      documents that are older than the latest consensus.  This bug might
-      have degraded client bootstrapping.  Bugfix on 0.2.0.10-alpha.
+      documents that are older than the latest consensus. This bug might
+      have degraded client bootstrapping. Bugfix on 0.2.0.10-alpha.
       Spotted and fixed by xmux.
     - Fix a couple of very-hard-to-trigger memory leaks, and one hard-to-
       trigger platform-specific option misparsing case found by Coverity
       Scan.
     - Fix a compilation warning on Fedora 12 by removing an impossible-to-
-      trigger assert.  Fixes bug 1173.
+      trigger assert. Fixes bug 1173.
 
 
 Changes in version 0.2.1.20 - 2009-10-15
diff --git a/ReleaseNotes b/ReleaseNotes
index a93a56d37..7e1194001 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -3,6 +3,33 @@ This document summarizes new features and bugfixes in each stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.2.1.21 - 2009-12-21
+  Tor 0.2.0.21 fixes an incompatibility with the most recent OpenSSL
+  library. If you use Tor on Linux / Unix and you're getting SSL
+  renegotiation errors, upgrading should help. We also recommend an
+  upgrade if you're an exit relay.
+
+  o Major bugfixes:
+    - Work around a security feature in OpenSSL 0.9.8l that prevents our
+      handshake from working unless we explicitly tell OpenSSL that we
+      are using SSL renegotiation safely. We are, of course, but OpenSSL
+      0.9.8l won't work unless we say we are.
+    - Avoid crashing if the client is trying to upload many bytes and the
+      circuit gets torn down at the same time, or if the flip side
+      happens on the exit relay. Bugfix on 0.2.0.1-alpha; fixes bug 1150.
+
+  o Minor bugfixes:
+    - Do not refuse to learn about authority certs and v2 networkstatus
+      documents that are older than the latest consensus. This bug might
+      have degraded client bootstrapping. Bugfix on 0.2.0.10-alpha.
+      Spotted and fixed by xmux.
+    - Fix a couple of very-hard-to-trigger memory leaks, and one hard-to-
+      trigger platform-specific option misparsing case found by Coverity
+      Scan.
+    - Fix a compilation warning on Fedora 12 by removing an impossible-to-
+      trigger assert. Fixes bug 1173.
+
+
 Changes in version 0.2.1.20 - 2009-10-15
   Tor 0.2.1.20 fixes a crash bug when you're accessing many hidden
   services at once, prepares for more performance improvements, and
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f58bb584b..a76a8b4b3 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -228,5 +228,3 @@
 /* Version number of package */
 #define VERSION "0.2.2.6-alpha-dev"
 
-
-