Commit f96b6cce authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.4.3'

parents 6dc9930d e6186741

changes/bug34077

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (compiler warnings):

    - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on

      0.4.0.3-alpha.

src/feature/dirauth/shared_random_state.c

+2 −1
Original line number Diff line number Diff line
@@ -1041,8 +1041,9 @@ sr_state_set_valid_after(time_t valid_after) 
sr_phase_t

sr_state_get_phase(void)

{

  void *ptr;

  void *ptr=NULL;

  state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr);

  tor_assert(ptr);

  return *(sr_phase_t *) ptr;

}

src/feature/hs/hs_client.c

+1 −1
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ client_desc_missing_bad_client_auth(const smartlist_t *entry_conns, 
      /* We should not be called with another type of status. Recover by

       * sending a generic error. */

      tor_assert_nonfatal_unreached();

      code = HS_DESC_DECODE_GENERIC_ERROR;

      code = SOCKS5_GENERAL_ERROR;

    }

    entry_conn->socks_request->socks_extended_error_code = code;

    connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_MISC);