diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-07-16 15:47:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-07-16 15:47:00 -0400 |
| commit | 6a08bcf530f5991ae0e2600ef01be377857b5942 (patch) | |
| tree | 172201b27b625f4e2565cc801a1c4b62a23aa20f /src/or/config.c | |
| parent | 2ba6542517fcff4ec4e7051870085cfdb6bc26aa (diff) | |
| parent | 2f8cf524ba4e565ab613504a4c41fd724d32facc (diff) | |
| download | tor-6a08bcf530f5991ae0e2600ef01be377857b5942.tar.gz tor-6a08bcf530f5991ae0e2600ef01be377857b5942.zip | |
Merge remote-tracking branch 'public/ticket16543'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index e686f61a26..011a36db17 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -278,7 +278,7 @@ static config_var_t option_vars_[] = { V(AccelName, STRING, NULL), V(AccelDir, FILENAME, NULL), V(HashedControlPassword, LINELIST, NULL), - V(HidServDirectoryV2, BOOL, "1"), + OBSOLETE("HidServDirectoryV2"), VAR("HiddenServiceDir", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceDirGroupReadable", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceOptions",LINELIST_V, RendConfigLines, NULL), @@ -448,6 +448,7 @@ static config_var_t option_vars_[] = { V(V3BandwidthsFile, FILENAME, NULL), V(GuardfractionFile, FILENAME, NULL), VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), + OBSOLETE("VoteOnHidServDirectoriesV2"), V(VirtualAddrNetworkIPv4, STRING, "127.192.0.0/10"), V(VirtualAddrNetworkIPv6, STRING, "[FE80::]/10"), V(WarnPlaintextPorts, CSV, "23,109,110,143"), @@ -460,7 +461,6 @@ static config_var_t option_vars_[] = { NULL), VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL), V(MinUptimeHidServDirectoryV2, INTERVAL, "96 hours"), - V(VoteOnHidServDirectoriesV2, BOOL, "1"), V(TestingServerDownloadSchedule, CSV_INTERVAL, "0, 0, 0, 60, 60, 120, " "300, 900, 2147483647"), V(TestingClientDownloadSchedule, CSV_INTERVAL, "0, 0, 60, 300, 600, " |