[or-cvs] [tor/master 2/7] new dannenberg address; make moria2's demise official.

[nickm@xxxxxxxxxxxxxx]

Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Fri, 12 Feb 2010 14:31:08 -0500
Subject: new dannenberg address; make moria2's demise official.
Commit: 3e6a37e61e7a7cd654fffff9eafdcbf65f7a3fd8

---
 ChangeLog       |    5 +++++
 src/or/config.c |    4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a743f0..b75ac0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,11 @@ Changes in version 0.2.1.23 - 2010-02-12
       requested before. Fixes bug 1242, bugfix on 0.2.0.18-alpha. Found
       by aakova.
 
+  o Directory authority changes:
+    - Change IP address for dannenberg (v3 directory authority), and
+      remove moria2 (obsolete v1, v2 directory authority and v0 hidden
+      service directory authority) from the list.
+
   o Minor bugfixes:
     - Refactor resolve_my_address() to not use gethostbyname() anymore.
       Fixes bug 1244; bugfix on 0.0.2pre25. Reported by Mike Mestnik.
diff --git a/src/or/config.c b/src/or/config.c
index a634f16..26d6644 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -906,8 +906,6 @@ add_default_trusted_dir_authorities(authority_type_t type)
     "moria1 orport=9101 no-v2 "
       "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
       "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-    "moria2 v1 orport=9002 128.31.0.34:9032 "
-      "719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF",
     "tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
       "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
     "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
@@ -921,7 +919,7 @@ add_default_trusted_dir_authorities(authority_type_t type)
       "80.190.246.100:8180 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
     "dannenberg orport=443 no-v2 "
       "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
-      "213.73.91.31:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
+      "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
     "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
       "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
     NULL
-- 
1.6.5