commit sebastian's patch to not require contactinfo when testingtornetwork

is set

svn:r19257

diff --git a/src/or/config.c b/src/or/config.c
index 6b89eceb5a5d5178889532073d5a665de21e61c5..caf018d27fbaae022a69a6399241f41787c4e947 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3039,7 +3039,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
   }
 
   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.");