fix a few typos, and give the bootstrap phase stuff a changelog entry.

svn:r15183

1 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a4533350..a5e49ae11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
-Changes in version 0.2.1.1-alpha - 2008-??-??
+Changes in version 0.2.1.1-alpha - 2008-06-13
+  o Major features:
+    - Modify the list of ciphers advertised by OpenSSL in client mode
+      to even more closely resemble a common web browser.  We cheat a
+      little so that we can advertise ciphers that the locally
+      installed OpenSSL doesn't know about.
+    - Start sending "bootstrap phase" status events to the controller,
+      so it can keep the user informed of progress fetching directory
+      information and establishing circuits. Also inform the controller
+      if we think we're stuck at a particular bootstrap phase. Implements
+      proposal 137.
+
   o Memory fixes and improvements:
     - Add a malloc_good_size implementation to OpenBSD_malloc_linux.c,
       to avoid unused RAM in buffer chunks and memory pools.
@@ -37,12 +48,6 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
       service, with the 30 seconds being the current voodoo saying that
       a descriptor is stable.
 
-  o Major features:
-    - Modify the list of ciphers advertised by OpenSSL in client mode
-      to even more closely resemble a common web browser.  We cheat a
-      little so that we can advertise ciphers that the locally
-      installed OpenSSL doesn't know about.
-
   o Minor features:
     - Allow separate log levels to be configured for different logging
       domains.  For example, this allows one to log all notices, warnings,