summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNeel Chauhan <neel@neelc.org>2020-02-18 08:20:11 -0800
committerDavid Goulet <dgoulet@torproject.org>2020-03-09 09:33:00 -0400
commit7d673e70b072663e3f9f11819b166846e578251d (patch)
treebee9fffb6773c399f487718c57fdcdc3349a2181 /src/app
parent17724a7cdeb9b98539831f1164a82784f1fb050f (diff)
downloadtor-7d673e70b072663e3f9f11819b166846e578251d.tar.gz
tor-7d673e70b072663e3f9f11819b166846e578251d.zip
Remove the ClientAutoIPv6ORPort option
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c2
-rw-r--r--src/app/config/or_options_st.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index bbf984ad08..6ead03ffd0 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -366,7 +366,7 @@ static const config_var_t option_vars_[] = {
#endif /* defined(HAVE_MODULE_RELAY) || defined(TOR_UNIT_TESTS) */
V(ClientPreferIPv6ORPort, AUTOBOOL, "auto"),
V(ClientPreferIPv6DirPort, AUTOBOOL, "auto"),
- V(ClientAutoIPv6ORPort, BOOL, "0"),
+ OBSOLETE("ClientAutoIPv6ORPort"),
V(ClientRejectInternalAddresses, BOOL, "1"),
V(ClientTransportPlugin, LINELIST, NULL),
V(ClientUseIPv6, BOOL, "0"),
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 35ba15a9e2..bf58205f89 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -662,9 +662,6 @@ struct or_options_t {
* accessing this value directly. */
int ClientPreferIPv6DirPort;
- /** If true, prefer an IPv4 or IPv6 OR port at random. */
- int ClientAutoIPv6ORPort;
-
/** 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. */