diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-11 15:37:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-11 15:37:56 -0400 |
| commit | 0803d79f55e0554c8f9c479112f3a317a97b4ddf (patch) | |
| tree | 554b1208136cc758973f3fbbd413b1422bd5dc9e /src/or/config.c | |
| parent | f9ba0c65467fe80f65b3789365cfac874198a337 (diff) | |
| parent | 8b8630a501759c8aad1783053e853259da961a32 (diff) | |
| download | tor-0803d79f55e0554c8f9c479112f3a317a97b4ddf.tar.gz tor-0803d79f55e0554c8f9c479112f3a317a97b4ddf.zip | |
Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3
Diffstat (limited to 'src/or/config.c')
| -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 b82efbf9a1..cec14e0f56 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), |