aboutsummaryrefslogtreecommitdiff
path: root/src/feature/rend/rendmid.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-09-09 11:10:53 -0400
committerNick Mathewson <nickm@torproject.org>2019-09-09 11:10:53 -0400
commita642a4cbd7016b350b7386096e752e1a73057b54 (patch)
tree2cad51c0a640f51b893a52d88e73d118c3b5b6b7 /src/feature/rend/rendmid.c
parent1e7c7870e87ff660d4dce0b381790993be0328eb (diff)
parent622c2c7884fd656b5140245c4695a5a145dc04fd (diff)
downloadtor-a642a4cbd7016b350b7386096e752e1a73057b54.tar.gz
tor-a642a4cbd7016b350b7386096e752e1a73057b54.zip
Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged
Diffstat (limited to 'src/feature/rend/rendmid.c')
-rw-r--r--src/feature/rend/rendmid.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
index bc86df632c..06471b2a7f 100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@ -118,8 +118,7 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request,
/* Now, set up this circuit. */
circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_INTRO_POINT);
hs_circuitmap_register_intro_circ_v2_relay_side(circ, (uint8_t *)pk_digest);
- token_bucket_ctr_init(&circ->introduce2_bucket, hs_dos_get_intro2_rate(),
- hs_dos_get_intro2_burst(), (uint32_t) approx_time());
+ hs_dos_setup_default_intro2_defenses(circ);
log_info(LD_REND,
"Established introduction point on circuit %u for service %s",