Commit 8fe410e8 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'andrea/oos-test-failures'

parents a601ed5c 33a3e6f7

src/or/connection.c

+2 −2
Original line number Diff line number Diff line
@@ -4510,8 +4510,8 @@ oos_victim_comparator_for_orconns(or_connection_t *a, or_connection_t *b) 
  a_circs = connection_or_get_num_circuits(a);

  b_circs = connection_or_get_num_circuits(b);



  if (a_circs < b_circs) return -1;

  else if (a_circs > b_circs) return 1;

  if (a_circs < b_circs) return 1;

  else if (a_circs > b_circs) return -1;

  else return 0;

}

src/test/test_oos.c

+2 −0
Original line number Diff line number Diff line
@@ -294,6 +294,8 @@ test_oos_kill_conn_list(void *arg) 
  dir_c2 = tor_malloc_zero(sizeof(*dir_c2));

  dir_c2->base_.magic = DIR_CONNECTION_MAGIC;

  dir_c2->base_.type = CONN_TYPE_DIR;

  dir_c2->base_.state = DIR_CONN_STATE_MIN_;

  dir_c2->base_.purpose = DIR_PURPOSE_MIN_;

  c2 = TO_CONN(dir_c2);



  tt_assert(c1 != NULL);