diff --git a/ChangeLog b/ChangeLog
index c4f18ba8b0..6e304e580e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,16 @@
-Changes in version 0.2.0.12-alpha - 2007-11-??
+Changes in version 0.2.0.12-alpha - 2007-11-16
   o Compile fixes:
     - Make it build on OpenBSD again. Patch from tup.
-    - Substitute BINDIR and LOCALSTATEDIR in scripts.  Fixes packaging.
+    - Substitute BINDIR and LOCALSTATEDIR in scripts. Fixes
+      package-building for Red Hat, OS X, etc.
 
   o Minor bugfixes:
     - When we're lacking a consensus, don't try to perform rendezvous
-      operations.  (Bug spotted by Karsten)
+      operations. Reported by Karsten Loesing.
     - Fix a small memory leak whenever we decide against using a
       newly picked entry guard. Reported by Mike Perry.
     - Changing the ExitPolicyRejectPrivate setting should cause us to
-      rebuild the descriptor.
+      rebuild our server descriptor.
     - When authorities detected more than two relays running on the same
       IP address, they were clearing all the status flags but forgetting
       to clear the "hsdir" flag. So clients were being told that a
@@ -25,9 +26,10 @@ Changes in version 0.2.0.12-alpha - 2007-11-??
       then be flexible about families.
 
   o Minor features:
-    - When we negotiate a v2 OR connection (not yet implemented), accept
-      RELAY_EARLY cells and turn them into RELAY cells if we've negotiated
-      a v1 connection.  Initial code for proposal 110.
+    - When we negotiate a v2 link-layer connection (not yet implemented),
+      accept RELAY_EARLY cells and turn them into RELAY cells if we've
+      negotiated a v1 connection for their next step. Initial code for
+      proposal 110.
 
 
 Changes in version 0.2.0.11-alpha - 2007-11-12
diff --git a/configure.in b/configure.in
index 9d20e47a3b..20f9fd4ce6 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.0.11-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.0.12-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 77dcb40bdf..3324287e49 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -5,7 +5,7 @@
 ;
 !include "MUI.nsh"
 
-!define VERSION "0.2.0.11-alpha-dev"
+!define VERSION "0.2.0.12-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 
diff --git a/doc/TODO b/doc/TODO
index cb0755172d..661d38570f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -14,12 +14,10 @@ J       - Jeff claims
         D Deferred
         X Abandoned
 
-Items blocking 0.2.0.11-alpha:
-  - bug 548.
-
-For Tor 0.2.0.12-alpha:
+For Tor 0.2.0.13-alpha:
   - Put a consensus in place of the empty fallback-consensus file in
     src/config and see what breaks.
+  - let bridges set relaybandwidthrate as low as 5kb
 
 Things we'd like to do in 0.2.0.x:
   - See also Flyspray tasks.
diff --git a/src/or/config.c b/src/or/config.c
index e39017d7a3..abf919bfe1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2888,9 +2888,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
       *msg = tor_strdup(r >= 0 ? buf : "internal error");
       return -1;
     }
-    if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
-      REJECT("RelayBandwidthBurst must be at least equal "
-             "to RelayBandwidthRate.");
     if (options->RelayBandwidthRate &&
       options->RelayBandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
       r = tor_snprintf(buf, sizeof(buf),
@@ -2903,6 +2900,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
     }
   }
 
+  if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
+    REJECT("RelayBandwidthBurst must be at least equal "
+           "to RelayBandwidthRate.");
+
   if (options->BandwidthRate > options->BandwidthBurst)
     REJECT("BandwidthBurst must be at least equal to BandwidthRate.");
 
@@ -3189,7 +3190,8 @@ options_transition_affects_descriptor(or_options_t *old_options,
       !opt_streq(old_options->Nickname,new_options->Nickname) ||
       !opt_streq(old_options->Address,new_options->Address) ||
       !config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) ||
-      old_options->ExitPolicyRejectPrivate != new_options->ExitPolicyRejectPrivate ||
+      old_options->ExitPolicyRejectPrivate !=
+        new_options->ExitPolicyRejectPrivate ||
       old_options->ORPort != new_options->ORPort ||
       old_options->DirPort != new_options->DirPort ||
       old_options->ClientOnly != new_options->ClientOnly ||
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 0230ac5b03..55ac183476 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -227,6 +227,6 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.0.11-alpha-dev"
+#define VERSION "0.2.0.12-alpha"