diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-10-13 14:37:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-10-13 14:38:32 -0400 |
| commit | 42a5e652cb9dc9818abd63d93fd51e908f2c56a4 (patch) | |
| tree | fa777792bec97c4fcccba8fa36eb6b2596ad7ad7 /src/app | |
| parent | ac311a38ec62e17868b484b8ace069d171c7506d (diff) | |
| download | tor-42a5e652cb9dc9818abd63d93fd51e908f2c56a4.tar.gz tor-42a5e652cb9dc9818abd63d93fd51e908f2c56a4.zip | |
Make OptimisticData always-on.
We've been using it for years, and it seems to work just fine. This
patch removes the option and its network parameter.
Part of #40139
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 2 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 0706a0dbdc..9625ed77fb 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -610,7 +610,7 @@ static const config_var_t option_vars_[] = { V(TestingAuthKeySlop, INTERVAL, "3 hours"), V(TestingSigningKeySlop, INTERVAL, "1 day"), - V(OptimisticData, AUTOBOOL, "auto"), + OBSOLETE("OptimisticData"), OBSOLETE("PortForwarding"), OBSOLETE("PortForwardingHelper"), OBSOLETE("PreferTunneledDirConns"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 7f201b8dd7..6a5d408c54 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -869,10 +869,6 @@ struct or_options_t { * once. */ int MaxClientCircuitsPending; - /** If 1, we always send optimistic data when it's supported. If 0, we - * never use it. If -1, we do what the consensus says. */ - int OptimisticData; - /** If 1, we accept and launch no external network connections, except on * control ports. */ int DisableNetwork; |