torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3'

Browse Source
This commit is contained in:
Nick Mathewson
2018-04-11 15:38:00 -04:00
parent 0c8f901ee7 0803d79f55
commit a51630cc9a
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/config.c
+5 -2
View File
@@ -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),