diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-09-18 15:02:16 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-09-18 15:02:16 -0400 |
commit | 94a88eaa45adfb05359ceed99aea572f9b123974 (patch) | |
tree | 7a00a270c271ff2d49d3f8df594bf1e2d6bf6ed9 /src/or/config.c | |
parent | 3c9ff0af96835575af942a367726732366977581 (diff) | |
parent | de6f121b5984c7c2c647c785f4707cd5392b37e8 (diff) | |
download | tor-94a88eaa45adfb05359ceed99aea572f9b123974.tar.gz tor-94a88eaa45adfb05359ceed99aea572f9b123974.zip |
Merge remote-tracking branch 'public/ticket19704'
Diffstat (limited to 'src/or/config.c')
-rw-r--r-- | src/or/config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 4ee1403819..6e8a06ec77 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -689,6 +689,10 @@ static const config_deprecation_t option_deprecation_notes_[] = { "to your directory server, which your Tor probably wasn't using." }, { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy " "which should be used with HTTPSProxyAuthenticator." }, + { "ReachableDirAddresses", "It has no effect on relays, and has had no " + "effect on clients since 0.2.8." }, + { "ClientPreferIPv6DirPort", "It has no effect on relays, and has had no " + "effect on clients since 0.2.8." }, /* End of options deprecated since 0.3.2.0-alpha. */ { NULL, NULL } |