diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-11-06 17:42:37 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-11-06 17:42:37 -0400 |
| commit | d96c9cd00e35ed1ab4e280cb70fa5dae93002a71 (patch) | |
| tree | e3c47e28823938f07156e65469583c73ff01b0bf /src/or | |
| parent | c109ffaef9a166e99778e401deaa4d842d749d40 (diff) | |
| parent | 70411a50b1204c8a1551c0c60428494202b4afe9 (diff) | |
| download | tor-d96c9cd00e35ed1ab4e280cb70fa5dae93002a71.tar.gz tor-d96c9cd00e35ed1ab4e280cb70fa5dae93002a71.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 7dbe91a7c0..5d4373f7d1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -416,6 +416,7 @@ static config_var_t testing_tor_network_defaults[] = { V(TestingV3AuthInitialDistDelay, INTERVAL, "20 seconds"), V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"), V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"), + V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } }; #undef VAR |