[or-cvs] r19257: {tor} commit sebastian's patch to not require contactinfo when tes (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2009-04-10 03:02:19 -0400 (Fri, 10 Apr 2009)
New Revision: 19257

Modified:
   tor/trunk/src/or/config.c
Log:
commit sebastian's patch to not require contactinfo when testingtornetwork
is set


Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2009-04-10 05:29:57 UTC (rev 19256)
+++ tor/trunk/src/or/config.c	2009-04-10 07:02:19 UTC (rev 19257)
@@ -3039,7 +3039,7 @@
   }
 
   if (options->AuthoritativeDir) {
-    if (!options->ContactInfo)
+    if (!options->ContactInfo && !options->TestingTorNetwork)
       REJECT("Authoritative directory servers must set ContactInfo");
     if (options->V1AuthoritativeDir && !options->RecommendedVersions)
       REJECT("V1 auth dir servers must set RecommendedVersions.");