Commit 66624ded authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Merge remote-tracking branch 'origin/maint-0.2.4' 

Conflicts:
	src/or/relay.c
parents b571b966 50fc8fb5

changes/bug9927

0 → 100644
+4 −0
Changes for changes/bug9927: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Minor features:

    - Generate bootstrapping status update events correctly for fetching

      microdescriptors. Fixes bug 9927.

src/or/directory.c

+2 −0
Changes for src/or/directory.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2125,6 +2125,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) 
        /* Mark remaining ones as failed. */

        dir_microdesc_download_failed(which, status_code);

      }

      control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,

                              count_loading_descriptors_progress());

      SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));

      smartlist_free(which);

      smartlist_free(mds);

src/or/relay.c

+1 −0
Changes for src/or/relay.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -1106,6 +1106,7 @@ connection_edge_process_relay_cell_not_open( 
          control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_STATUS, 0);

          break;

        case DIR_PURPOSE_FETCH_SERVERDESC:

        case DIR_PURPOSE_FETCH_MICRODESC:

          if (TO_DIR_CONN(dirconn)->router_purpose == ROUTER_PURPOSE_GENERAL)

            control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,

                                    count_loading_descriptors_progress());