fix a bug where we were never reporting the

"Finishing handshake with entry guard" bootstrap phase

svn:r15087

diff --git a/src/or/control.c b/src/or/control.c
index 97ca13225a94f564b7721f96683e194e6e8aed6d..57a2fe846ce789180a21cbd44cf0247264bbace1 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3906,10 +3906,10 @@ control_event_bootstrap(bootstrap_status_t status, int percent)
   if (last_percent == 100)
     return 0; /* already bootstrapped; nothing to be done here. */
 
-  /* special case for handshaking status, since our tls handshaking code
+  /* special case for handshaking status, since our TLS handshaking code
    * can't distinguish what the connection is going to be for. */
   if (status == BOOTSTRAP_STATUS_HANDSHAKE) {
-    if (last_percent < BOOTSTRAP_STATUS_HANDSHAKE_OR) {
+    if (last_percent < BOOTSTRAP_STATUS_CONN_OR) {
       status =  BOOTSTRAP_STATUS_HANDSHAKE_DIR;
     } else {
       status = BOOTSTRAP_STATUS_HANDSHAKE_OR;