diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-17 09:50:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-17 09:50:18 -0400 |
| commit | 0b6fb5ebcdccd7267e60caf5418b31977c41f12c (patch) | |
| tree | 4106b6dc82df828427772b587e1797dade3e2388 /src/or | |
| parent | 7ac8a4a037581ab7c47079cc98c9d3496932a8bd (diff) | |
| parent | 21c6c8485367ce66ab0791c153177c17bccd25c5 (diff) | |
| download | tor-0b6fb5ebcdccd7267e60caf5418b31977c41f12c.tar.gz tor-0b6fb5ebcdccd7267e60caf5418b31977c41f12c.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index ceb21b0cf0..7caebaefb3 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) { |