diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-08-25 14:51:05 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-08-25 14:51:05 +0300 |
| commit | 1397a86bbda04fbcf3e902282ccb4dd689821ea1 (patch) | |
| tree | 511c9b8851995031de6bf3f8ceb5d85ebb19531e /src/core/or | |
| parent | 6e37086f85aa3e421ebc6f4d64de1cd82bcdeaa6 (diff) | |
| parent | f5c9f6d4327d7dcd36081426c0a862b6a06a2b61 (diff) | |
| download | tor-1397a86bbda04fbcf3e902282ccb4dd689821ea1.tar.gz tor-1397a86bbda04fbcf3e902282ccb4dd689821ea1.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4
Diffstat (limited to 'src/core/or')
| -rw-r--r-- | src/core/or/or_circuit_st.h | 4 |
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 |