[or-cvs] [tor/maint-0.2.1 1/2] rotate keys for moria1 and gabelmoo

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Tue, 19 Jan 2010 14:12:39 -0500
Subject: rotate keys for moria1 and gabelmoo
Commit: adae6007152bfe04925bae75db87c97c1f62f92a

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

diff --git a/ChangeLog b/ChangeLog
index 0732265..df66c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Changes in version 0.2.1.22 - 2010-??-??
+Changes in version 0.2.1.22 - 2010-01-19
+  o Directory authority changes:
+    - Rotate keys (both v3 identity and relay identity) for moria1
+      and gabelmoo.
+
   o Major bugfixes:
     - Stop bridge directory authorities from answering dbg-stability.txt
       directory queries, which would let people fetch a list of all
diff --git a/src/or/config.c b/src/or/config.c
index 128aa4d..9d9e029 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -903,8 +903,9 @@ add_default_trusted_dir_authorities(authority_type_t type)
 {
   int i;
   const char *dirservers[] = {
-    "moria1 v1 orport=9001 v3ident=E2A2AF570166665D738736D0DD58169CC61D8A8B "
-      "128.31.0.39:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441",
+    "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 "
@@ -915,9 +916,9 @@ add_default_trusted_dir_authorities(authority_type_t type)
       "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
     "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
       "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",
-    "gabelmoo orport=443 no-v2 "
-      "v3ident=81349FC1F2DBA2C2C11B45CB9706637D480AB913 "
-      "80.190.246.100:80 6833 3D07 61BC F397 A587 A0C0 B963 E4A9 E99E C4D3",
+    "gabelmoo orport=8080 no-v2 "
+      "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+      "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",
-- 
1.6.5