Commit cd3f9572 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.4'

parents 1f389dad 75a6e7e2

src/test/test_channelpadding.c

+1 −0
Original line number Diff line number Diff line
@@ -706,6 +706,7 @@ test_channelpadding_consensus(void *arg) 
  memcpy(relay->identity_digest,

          ((channel_tls_t *)chan)->conn->identity_digest, DIGEST_LEN);

  smartlist_add(current_md_consensus->routerstatus_list, relay);

  relay = NULL; /* Prevent double-free */



  tried_to_write_cell = 0;

  decision = channelpadding_decide_to_pad_channel(chan);

src/test/test_hs_descriptor.c

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ test_link_specifier(void *arg) 
    tt_int_op(link_specifier_get_un_ipv4_port(ls), OP_EQ, spec.u.ap.port);



    link_specifier_free(ls);

    ls = NULL;

    tor_free(b64);

  }
@@ -240,6 +241,7 @@ test_link_specifier(void *arg) 
    tt_int_op(link_specifier_get_un_ipv6_port(ls), OP_EQ, spec.u.ap.port);



    link_specifier_free(ls);

    ls = NULL;

    tor_free(b64);

  }
@@ -267,6 +269,7 @@ test_link_specifier(void *arg) 
    tt_mem_op(spec.u.legacy_id, OP_EQ, id, DIGEST_LEN);



    link_specifier_free(ls);

    ls = NULL;

    tor_free(b64);

  }

src/test/test_shared_random.c

+1 −0
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ test_sr_setup_commits(void) 
  /* Now during REVEAL phase save commit D by restoring its reveal. */

  set_sr_phase(SR_PHASE_REVEAL);

  save_commit_to_state(place_holder);

  place_holder = NULL;

  tt_str_op(commit_d->encoded_reveal, OP_EQ,

            "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");

  /* Go back to an empty encoded reveal value. */