diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-11 15:38:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-11 15:38:00 -0400 |
| commit | a51630cc9af96642b05b9d0db345ea2d7d3ce128 (patch) | |
| tree | 7a7d56eab06870c9bc791a47d3dfb512d28c3d4d /src | |
| parent | 0c8f901ee7c3cfd2351e7f6e723998226fabe190 (diff) | |
| parent | 0803d79f55e0554c8f9c479112f3a317a97b4ddf (diff) | |
| download | tor-a51630cc9af96642b05b9d0db345ea2d7d3ce128.tar.gz tor-a51630cc9af96642b05b9d0db345ea2d7d3ce128.zip | |
Merge branch 'maint-0.3.3'
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 9cd66cbf63..456d44dd2e 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), |