aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2020-08-25 14:51:23 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2020-08-25 14:51:23 +0300
commit935160ce8629096691268f9902a803c4b871bacc (patch)
tree39c3cfdd2d11072c576c122549750c4ec7de5812 /src/core
parent36203e88949c6928d2bdb4bffe8b5e7e68657ee9 (diff)
parent1397a86bbda04fbcf3e902282ccb4dd689821ea1 (diff)
downloadtor-935160ce8629096691268f9902a803c4b871bacc.tar.gz
tor-935160ce8629096691268f9902a803c4b871bacc.zip
Merge branch 'maint-0.4.4'
Diffstat (limited to 'src/core')
-rw-r--r--src/core/or/or_circuit_st.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/or/or_circuit_st.h b/src/core/or/or_circuit_st.h
index 9bfe999728..4e17b1c143 100644
--- a/src/core/or/or_circuit_st.h
+++ b/src/core/or/or_circuit_st.h
@@ -75,6 +75,10 @@ struct or_circuit_t {
/** If set, the DoS defenses are enabled on this circuit meaning that the
* introduce2_bucket is initialized and used. */
unsigned int introduce2_dos_defense_enabled : 1;
+ /** If set, the DoS defenses were explicitly enabled through the
+ * ESTABLISH_INTRO cell extension. If unset, the consensus is used to learn
+ * if the defenses can be enabled or not. */
+ unsigned int introduce2_dos_defense_explicit : 1;
/** INTRODUCE2 cell bucket controlling how much can go on this circuit. Only
* used if this is a service introduction circuit at the intro point