summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-09-19 03:22:01 +0000
committerRoger Dingledine <arma@torproject.org>2007-09-19 03:22:01 +0000
commit53f57dd7c0a2bc5258fb9fac8d40f55ad89491ea (patch)
tree44196364f5c6fbe0127d3248bf47fa8b35bd5653
parent2f4fa29b70adf128d9d8788f3d311150e2731818 (diff)
downloadtor-53f57dd7c0a2bc5258fb9fac8d40f55ad89491ea.tar.gz
tor-53f57dd7c0a2bc5258fb9fac8d40f55ad89491ea.zip
Set up moria1 as the first v3 directory authority.
svn:r11506
-rw-r--r--ChangeLog4
-rw-r--r--src/or/config.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ab4ed3acd..5980ea956b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
Changes in version 0.2.0.7-alpha - 2007-??-??
+ o New directory authorities:
+ - Set up moria1 as the first v3 directory authority. See
+ doc/spec/dir-spec.txt for details on the new directory design.
+
o Minor features (security):
- As a client, do not believe any server that tells us that any address
maps to an internal address space.
diff --git a/src/or/config.c b/src/or/config.c
index 9cf6b96d5b..5eeee15681 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -790,9 +790,8 @@ add_default_trusted_dirservers(void)
{
int i;
const char *dirservers[] = {
- /* eventually we should mark moria1 as "v1only" */
- "moria1 v1 orport=9001 128.31.0.34:9031 "
- "FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441",
+ "moria1 v1 orport=9001 v3ident=5420FD8EA46BD4290F1D07A1883C9D85ECC486C4 "
+ "128.31.0.34:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441",
"moria2 v1 orport=9002 128.31.0.34:9032 "
"719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF",
"tor26 v1 orport=443 86.59.21.38:80 "