diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-01 20:32:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-01 20:32:18 -0500 |
| commit | 2b2b97484ad07c91ac410735a96fe8710e60cf23 (patch) | |
| tree | 1e484c79478f34faea52da03e7bb262fa421d318 /src/app | |
| parent | 701eaef980de4f7dbb5c31c4fee9b7e1e266d7a1 (diff) | |
| parent | ad031b64ce355ac3af15adb716a4322858dce4a8 (diff) | |
| download | tor-2b2b97484ad07c91ac410735a96fe8710e60cf23.tar.gz tor-2b2b97484ad07c91ac410735a96fe8710e60cf23.zip | |
Merge branch 'ticket27490a_squashed'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 1 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 50f3793d6c..d40e362b32 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -340,6 +340,7 @@ static config_var_t option_vars_[] = { V(ClientOnly, BOOL, "0"), V(ClientPreferIPv6ORPort, AUTOBOOL, "auto"), V(ClientPreferIPv6DirPort, AUTOBOOL, "auto"), + V(ClientAutoIPv6ORPort, BOOL, "0"), 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 6cbc86ec18..9065248a9c 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -666,6 +666,9 @@ 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. */ |