nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source
This commit is contained in:
Nick Mathewson 2012-07-17 09:50:18 -04:00
commit 0b6fb5ebcd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug6377 Normal file
View File

@ -0,0 +1,4 @@
o Testing:
- Make it possible to set the TestingTorNetwork configuration
option using AlternateDirAuthority and AlternateBridgeAuthority
as an alternative to setting DirServer.

8
src/or/config.c
View File

@ -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) {