[tor-commits] [tor/maint-0.2.2] Increase default required uptime for HSDirs to 25 hours

[nickm at torproject.org]

commit f45261cb29504bfe39ddb96d8e7f38bb32dd37a5
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Tue May 10 03:35:45 2011 -0700

    Increase default required uptime for HSDirs to 25 hours
---
 changes/bug2649b |    5 +++++
 doc/tor.1.txt    |    2 +-
 src/or/config.c  |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug2649b b/changes/bug2649b
new file mode 100644
index 0000000..1ff14e5
--- /dev/null
+++ b/changes/bug2649b
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Change the default required uptime for a relay to be accepted as
+      a HSDir from 24 hours to 25 hours.  Bugfix on 0.2.0.10-alpha;
+      fixes bug 2649.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9c81198..f54b966 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1183,7 +1183,7 @@ if DirPort is non-zero):
 
 **MinUptimeHidServDirectoryV2** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**::
     Minimum uptime of a v2 hidden service directory to be accepted as such by
-    authoritative directories. (Default: 24 hours)
+    authoritative directories. (Default: 25 hours)
 
 **DirPort** __PORT__|**auto**::
     If this option is nonzero, advertise the directory service on this port.
diff --git a/src/or/config.c b/src/or/config.c
index 96696fe..f247740 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -401,7 +401,7 @@ static config_var_t _option_vars[] = {
   VAR("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword,
       NULL),
   VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL),
-  V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"),
+  V(MinUptimeHidServDirectoryV2, INTERVAL, "25 hours"),
   V(VoteOnHidServDirectoriesV2,  BOOL,     "1"),
   V(_UsingTestNetworkDefaults,   BOOL,     "0"),