Commit ac795353 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

fix a bug where we were never reporting the 

"Finishing handshake with entry guard" bootstrap phase


svn:r15087
parent 6aeb79af

src/or/control.c

+2 −2
Original line number Diff line number Diff line
@@ -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;