summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-04-10 07:02:19 +0000
committerRoger Dingledine <arma@torproject.org>2009-04-10 07:02:19 +0000
commitc4145e5390980cd7fb1e6f0777e9df6bf3e7639e (patch)
tree30ccbd96c5138a90b37fdb5cd31b644ebd16fedc
parentd50501e5ed7e2f1d444ba56ad108efc992c7e3e1 (diff)
downloadtor-c4145e5390980cd7fb1e6f0777e9df6bf3e7639e.tar.gz
tor-c4145e5390980cd7fb1e6f0777e9df6bf3e7639e.zip
commit sebastian's patch to not require contactinfo when testingtornetwork
is set svn:r19257
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 6b89eceb5a..caf018d27f 100644
--- 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.");