aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-01-10 13:05:05 +0200
committerGeorge Kadianakis <desnacked@riseup.net>2019-01-10 13:06:08 +0200
commit2b29bccb8553c4b80eccd3438b4b1463687b1d4c (patch)
tree2919ca7c41bd74f8cab4bc89c6bebbb77a2e7585 /src/core
parent4db9c3d63e93912a82eabeb8a9fb851d5196c3c8 (diff)
downloadtor-2b29bccb8553c4b80eccd3438b4b1463687b1d4c.tar.gz
tor-2b29bccb8553c4b80eccd3438b4b1463687b1d4c.zip
Misc trivial improvements around circpadding code.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/or/circuitpadding.c1
-rw-r--r--src/core/or/relay.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 6f10d3fb6a..6a39a7b371 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -304,6 +304,7 @@ circpad_histogram_usec_to_bin(const circpad_machine_state_t *mi,
else
start_usec = state->start_usec;
+ /* The first bin (#0) has zero width and starts (and ends) at start_usec. */
if (usec <= start_usec)
return 0;
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index 9c0f3bbbe3..00c2111955 100644
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -527,6 +527,7 @@ relay_command_to_string(uint8_t command)
case RELAY_COMMAND_EXTEND2: return "EXTEND2";
case RELAY_COMMAND_EXTENDED2: return "EXTENDED2";
case RELAY_COMMAND_PADDING_NEGOTIATE: return "PADDING_NEGOTIATE";
+ case RELAY_COMMAND_PADDING_NEGOTIATED: return "PADDING_NEGOTIATED";
default:
tor_snprintf(buf, sizeof(buf), "Unrecognized relay command %u",
(unsigned)command);