Commit f288f247 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'bug26896_034' into maint-0.3.4

parents 8ed4f1ee 21a9d034

changes/bug26896

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (directory connection shutdown):

    - Avoid a double-close when shutting down a stalled directory connection.

      Fixes bug 26896; bugfix on 0.3.4.1-alpha.

src/or/directory.c

+3 −1
Original line number Diff line number Diff line
@@ -5179,6 +5179,9 @@ connection_dir_finished_flushing(dir_connection_t *conn) 
  tor_assert(conn);

  tor_assert(conn->base_.type == CONN_TYPE_DIR);



  if (conn->base_.marked_for_close)

    return 0;



  /* Note that we have finished writing the directory response. For direct

   * connections this means we're done; for tunneled connections it's only

   * an intermediate step. */
@@ -5912,4 +5915,3 @@ dir_split_resource_into_spoolable(const char *resource, 
  smartlist_free(fingerprints);

  return r;

}