aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug2649b5
-rw-r--r--doc/tor.1.txt2
-rw-r--r--src/or/config.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug2649b b/changes/bug2649b
new file mode 100644
index 0000000000..1ff14e5569
--- /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 9c81198684..f54b966c27 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 96696fe627..f247740f18 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"),