diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-11-24 10:26:17 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-11-24 10:26:17 -0500 |
| commit | fd8097978607629c3e25a8db0c91ac20ce7086fb (patch) | |
| tree | b97990857494daddf007c23a94e289a39aeadd1e /src | |
| parent | 94fc207d42a18d1e3c1358dac4fbd5150af6609f (diff) | |
| parent | eaf814bd50be3588d699e2e773a2d57a9ebf58cb (diff) | |
| download | tor-fd8097978607629c3e25a8db0c91ac20ce7086fb.tar.gz tor-fd8097978607629c3e25a8db0c91ac20ce7086fb.zip | |
Merge branch 'tor-gitlab/mr/221'
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/or/command.c | 2 | ||||
| -rw-r--r-- | src/feature/stats/rephist.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/or/command.c b/src/core/or/command.c index 7767217275..e2bab87def 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -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; } diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 59f38fe603..f8d7887e65 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -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, |