advertise moria2's dirport as 18.244.0.114:80

svn:r2511

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index b86a9aa537ba820bded6ad96d53a6bced41959ec..5fcdabef5071b541e8e769c18916159bdc8c5957 100644 (file)
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -39,7 +39,7 @@ AllowUnverifiedNodes middle,rendezvous
 # and uses the given addresses to connect to the trusted directory
 # servers.
 DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
-DirServer 18.244.0.188:9032 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
+DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
 DirServer 62.116.124.106:9030 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
 
 ##################### Below is just for servers #####################

diff --git a/src/or/config.c b/src/or/config.c
index 31298cbc3f7163e7213e746477c9d944e45c46ff..db73a2fcc999c8492403207fac1f232a8393e45a 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -310,7 +310,7 @@ add_default_trusted_dirservers(void)
   parse_dir_server_line("18.244.0.188:9031 "
                         "FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441");
   /* moria2 */
-  parse_dir_server_line("18.244.0.188:9032 "
+  parse_dir_server_line("18.244.0.114:80 "
                         "719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF");
   /* tor26 */
   parse_dir_server_line("62.116.124.106:9030 "