diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-10-14 09:46:44 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-10-14 09:46:44 -0400 |
| commit | bb249a221f35fe3cef53df4c36c84c2d5e63b66d (patch) | |
| tree | 1e0073cedcc48b20bd0e255c4c91c8401d0adfcf /src/app | |
| parent | f02f8f8946bcfb0e11f9ce8c636845731cdddbeb (diff) | |
| parent | a251cff0c3c9cb04422c1d93ad6ea2e804b50a1e (diff) | |
| download | tor-bb249a221f35fe3cef53df4c36c84c2d5e63b66d.tar.gz tor-bb249a221f35fe3cef53df4c36c84c2d5e63b66d.zip | |
Merge branch 'tor-gitlab/mr/170'
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 817af22359..6c17bb0d8c 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 d19afcb3f6..3ccd2c9761 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -868,10 +868,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; |