Commit fd809797 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'tor-gitlab/mr/221'

parents 94fc207d eaf814bd

src/core/or/command.c

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) 
       * (which is the service->RP circuit) to see if it was using TAP and

       * hence if it's a v2 circuit. That's because client->RP circuits can

       * still use ntor even on v2; but service->RP will always use TAP. */

      or_circuit_t *splice = CONST_TO_OR_CIRCUIT(circ)->rend_splice;

      const or_circuit_t *splice = CONST_TO_OR_CIRCUIT(circ)->rend_splice;

      if (splice->used_legacy_circuit_handshake) {

        is_v2 = true;

      }

src/feature/stats/rephist.c

+2 −2
Original line number Diff line number Diff line
@@ -2009,11 +2009,11 @@ rep_hist_format_hs_stats(time_t now, bool is_v3) 
                           ONIONS_SEEN_EPSILON);



  format_iso_time(t, now);

  tor_asprintf(&hs_stats_string, "%s %s (%ld s)\n"

  tor_asprintf(&hs_stats_string, "%s %s (%u s)\n"

               "%s %"PRId64" delta_f=%d epsilon=%.2f bin_size=%d\n"

               "%s %"PRId64" delta_f=%d epsilon=%.2f bin_size=%d\n",

               is_v3 ? "hidserv-v3-stats-end" : "hidserv-stats-end",

               t, now - start_of_hs_stats_interval,

               t, (unsigned) (now - start_of_hs_stats_interval),

               is_v3 ?

                "hidserv-rend-v3-relayed-cells" : "hidserv-rend-relayed-cells",

               obfuscated_cells_seen, REND_CELLS_DELTA_F,