diff --git a/ChangeLog b/ChangeLog
index 62925d8677..8a743f05ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.1.23 - 2010-0?-??
+Changes in version 0.2.1.23 - 2010-02-12
   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
@@ -9,20 +9,20 @@ 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 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
diff --git a/ReleaseNotes b/ReleaseNotes
index 3790142d3d..000e174354 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -3,6 +3,40 @@ 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.23 - 2010-02-12
+  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
+      meant that Tor clients were severely limited on throughput (and
+      probably latency too) by the first hop in their circuit. Now we
+      select guards weighted by currently advertised bandwidth. We also
+      automatically discard guards picked using the old algorithm. Fixes
+      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.
+
+  o Minor bugfixes:
+    - 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
+      rotates half of its guards. Instead we spread the rotation out
+      throughout the month, but we still avoid leaving a precise timestamp
+      in the state file about when we first picked the guard. Improves
+      over the behavior introduced in 0.1.2.17.
+
+
 Changes in version 0.2.1.22 - 2010-01-19
   Tor 0.2.1.22 fixes a critical privacy problem in bridge directory
   authorities -- it would tell you its whole history of bridge descriptors
diff --git a/configure.in b/configure.in
index 86fa2eb1c2..5b12860a83 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.1.22)
+AM_INIT_AUTOMAKE(tor, 0.2.1.23)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index a6124c8568..a184f8267c 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -9,7 +9,7 @@
 !include "FileFunc.nsh"
 !insertmacro GetParameters
   
-!define VERSION "0.2.1.22"
+!define VERSION "0.2.1.23"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index dec1a9c459..c25cb8a382 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -226,6 +226,6 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.1.22"
+#define VERSION "0.2.1.23"