|
@@ -99,8 +99,6 @@ static config_abbrev_t option_abbrevs_[] = {
|
|
{ "PreferTunnelledDirConns", "PreferTunneledDirConns", 0, 0},
|
|
{ "PreferTunnelledDirConns", "PreferTunneledDirConns", 0, 0},
|
|
{ "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0},
|
|
{ "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0},
|
|
{ "HashedControlPassword", "__HashedControlSessionPassword", 1, 0},
|
|
{ "HashedControlPassword", "__HashedControlSessionPassword", 1, 0},
|
|
- { "StrictEntryNodes", "StrictNodes", 0, 1},
|
|
|
|
- { "StrictExitNodes", "StrictNodes", 0, 1},
|
|
|
|
{ "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0},
|
|
{ "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0},
|
|
{ "_UseFilteringSSLBufferevents", "UseFilteringSSLBufferevents", 0, 1},
|
|
{ "_UseFilteringSSLBufferevents", "UseFilteringSSLBufferevents", 0, 1},
|
|
{ NULL, NULL, 0, 0},
|
|
{ NULL, NULL, 0, 0},
|
|
@@ -400,6 +398,8 @@ static config_var_t option_vars_[] = {
|
|
V(SocksTimeout, INTERVAL, "2 minutes"),
|
|
V(SocksTimeout, INTERVAL, "2 minutes"),
|
|
V(SSLKeyLifetime, INTERVAL, "0"),
|
|
V(SSLKeyLifetime, INTERVAL, "0"),
|
|
OBSOLETE("StatusFetchPeriod"),
|
|
OBSOLETE("StatusFetchPeriod"),
|
|
|
|
+ OBSOLETE("StrictEntryNodes"),
|
|
|
|
+ OBSOLETE("StrictExitNodes"),
|
|
V(StrictNodes, BOOL, "0"),
|
|
V(StrictNodes, BOOL, "0"),
|
|
V(Support022HiddenServices, AUTOBOOL, "auto"),
|
|
V(Support022HiddenServices, AUTOBOOL, "auto"),
|
|
OBSOLETE("SysLog"),
|
|
OBSOLETE("SysLog"),
|