diff options
| author | Mike Perry <mikeperry-git@torproject.org> | 2023-03-07 19:11:38 +0000 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@torproject.org> | 2023-04-06 15:57:10 +0000 |
| commit | eac2bad86b6491b73b0086528b2b2cffe6c0d862 (patch) | |
| tree | 4c9d11febcdf72ed0a6b170c4e3cc85ac19bced5 /src/app | |
| parent | 0d14d6b44a7b42d860dabc643bb702fee530622c (diff) | |
| download | tor-eac2bad86b6491b73b0086528b2b2cffe6c0d862.tar.gz tor-eac2bad86b6491b73b0086528b2b2cffe6c0d862.zip | |
Prop#329 params: Consensus parameter and torrc handling
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 1 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 6b07d58240..66a8fe5853 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -377,6 +377,7 @@ static const config_var_t option_vars_[] = { V(ClientTransportPlugin, LINELIST, NULL), V(ClientUseIPv6, BOOL, "0"), V(ClientUseIPv4, BOOL, "1"), + V(ConfluxEnabled, AUTOBOOL, "auto"), V(ConnLimit, POSINT, "1000"), V(ConnDirectionStatistics, BOOL, "0"), V(ConstrainedSockets, BOOL, "0"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 0811af1388..056aa3b776 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -723,6 +723,10 @@ struct or_options_t { * accessing this value directly. */ int ClientPreferIPv6DirPort; + /** If true, the tor client will use conflux for its general purpose + * circuits which excludes onion service traffic. */ + int ConfluxEnabled; + /** The length of time that we think a consensus should be fresh. */ int V3AuthVotingInterval; /** The length of time we think it will take to distribute votes. */ |