From 21c6c8485367ce66ab0791c153177c17bccd25c5 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 11 Jul 2012 11:53:07 +0200 Subject: Allow TestingTorNetwork when alternate dir and bridge authorities are set. Allow TestingTorNetwork when AlternateDirAuthority and AlternateBridgeAuthority is set even if DirServer is not. --- src/or/config.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/or/config.c') diff --git a/src/or/config.c b/src/or/config.c index d90e0fc996..f5b5c8fb58 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4091,9 +4091,13 @@ options_validate(or_options_t *old_options, or_options_t *options, }); } - if (options->TestingTorNetwork && !options->DirServers) { + if (options->TestingTorNetwork && + !(options->DirServers || + (options->AlternateDirAuthority && + options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirServers."); + "a non-default set of DirServer or both of AlternateDirAuthority " + "and AlternateBridgeAuthority configured."); } if (options->AllowSingleHopExits && !options->DirServers) { -- cgit v1.2.3-54-g00ecf