diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-04-14 09:37:46 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-04-14 09:37:46 -0400 |
| commit | 32356a607608596a0607c80eb8505dedfc315894 (patch) | |
| tree | 2d2ccd0a169617baab53ad05664c253cf2a57af9 /src/core | |
| parent | b33f69abb54d06b324301977e87171d5902a39bf (diff) | |
| parent | dc90226cc3c7c74164f8feb1f50d2fbcf0941a9d (diff) | |
| download | tor-32356a607608596a0607c80eb8505dedfc315894.tar.gz tor-32356a607608596a0607c80eb8505dedfc315894.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.6
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/or/origin_circuit_st.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h index 9264077c50..6c86a56000 100644 --- a/src/core/or/origin_circuit_st.h +++ b/src/core/or/origin_circuit_st.h @@ -180,6 +180,12 @@ struct origin_circuit_t { unsigned first_hop_from_controller : 1; /** + * If true, this circuit's path has been chosen, in full or in part, + * by the controller API, and it's okay to ignore checks that we'd + * usually do on the path as whole. */ + unsigned int any_hop_from_controller : 1; + + /** * Tristate variable to guard against pathbias miscounting * due to circuit purpose transitions changing the decision * of pathbias_should_count(). This variable is informational |