diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-26 09:25:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-11 15:37:49 -0400 |
| commit | 8b8630a501759c8aad1783053e853259da961a32 (patch) | |
| tree | efdccb9ff5014a03c4790c615a26da61d0f82983 /src | |
| parent | eacfd2911274a7f6676509fc8173b66bd1264bc2 (diff) | |
| download | tor-8b8630a501759c8aad1783053e853259da961a32.tar.gz tor-8b8630a501759c8aad1783053e853259da961a32.zip | |
Rename HSLayer{2,3}Nodes to start without an underscore.
The old single-underscore names remain as a deprecated synonym.
Fixes bug 25581; bugfix on 0.3.3.1-alpha.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 685884fb84..abf4e3de26 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -172,6 +172,9 @@ static config_abbrev_t option_abbrevs_[] = { { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, { "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0}, { "SocksSocketsGroupWritable", "UnixSocksGroupWritable", 0, 1}, + { "_HSLayer2Nodes", "HSLayer2Nodes", 0, 1 }, + { "_HSLayer3Nodes", "HSLayer3Nodes", 0, 1 }, + { NULL, NULL, 0, 0}, }; @@ -419,8 +422,8 @@ static config_var_t option_vars_[] = { V(Socks5ProxyPassword, STRING, NULL), VAR("KeyDirectory", FILENAME, KeyDirectory_option, NULL), V(KeyDirectoryGroupReadable, BOOL, "0"), - VAR("_HSLayer2Nodes", ROUTERSET, HSLayer2Nodes, NULL), - VAR("_HSLayer3Nodes", ROUTERSET, HSLayer3Nodes, NULL), + VAR("HSLayer2Nodes", ROUTERSET, HSLayer2Nodes, NULL), + VAR("HSLayer3Nodes", ROUTERSET, HSLayer3Nodes, NULL), V(KeepalivePeriod, INTERVAL, "5 minutes"), V(KeepBindCapabilities, AUTOBOOL, "auto"), VAR("Log", LINELIST, Logs, NULL), |