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

svn:r15183

diff --git a/ChangeLog b/ChangeLog
index 4a4533350d2719838269282c0af34185eb605463..a5e49ae11ad2db22a1d81b27c8b68485e9da414f 100644 (file)
--- 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,

diff --git a/src/common/ciphers.inc b/src/common/ciphers.inc
index 37147e4bfe544b85d1649f626bf57ef7a1ec5389..c84620d49e2c0b28c0c61e224d610da9cd95b5b3 100644 (file)
--- a/src/common/ciphers.inc
+++ b/src/common/ciphers.inc
@@ -1,5 +1,5 @@
 /* This is an include file used to define the list of ciphers clients should
- * advertise.  Before including it, you should define the CIPHER and XCPIHER
+ * advertise.  Before including it, you should define the CIPHER and XCIPHER
  * macros. */
 #ifdef TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
     CIPHER(0xc00a, TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 73e1e776467e5e0cd112a9ef26a400bef9701169..46b2a11e2b5570855771ea9a4c350171c92034b9 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -104,10 +104,10 @@ struct tor_tls_t {
 #ifdef V2_HANDSHAKE_CLIENT
 /** An array of fake SSL_CIPHER objects that we use in order to trick OpenSSL
  * in client mode into advertising the ciphers we want.  See
- * rectify_client_ciphers for details. */
+ * rectify_client_ciphers() for details. */
 static SSL_CIPHER *CLIENT_CIPHER_DUMMIES = NULL;
 /** A stack of SSL_CIPHER objects, some real, some fake.
- * See rectify_client_ciphers for details. */
+ * See rectify_client_ciphers() for details. */
 static STACK_OF(SSL_CIPHER) *CLIENT_CIPHER_STACK = NULL;
 #endif
 
@@ -731,7 +731,7 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val)
 #endif
 
 /** Replace *<b>ciphers</b> with a new list of SSL ciphersuites: specifically,
- * a list designed to mimic a common web browser.  Some of the cipher in the
+ * a list designed to mimic a common web browser.  Some of the ciphers in the
  * list won't actually be implemented by OpenSSL: that's okay so long as the
  * server doesn't select them, and the server won't select anything besides
  * what's in SERVER_CIPHER_LIST.