diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:53:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:53:32 -0500 |
| commit | 95e21779a3666a137fc23912743f1c8ff6398c84 (patch) | |
| tree | 8617f539c11b9fd21a3e3b8ce357c2090040bfd4 /src | |
| parent | 0a3b7f1471b608a83edfdf3cdca391aca6f73eb1 (diff) | |
| parent | e895919b171029df4d38285b0be4483376b4ad25 (diff) | |
| download | tor-95e21779a3666a137fc23912743f1c8ff6398c84.tar.gz tor-95e21779a3666a137fc23912743f1c8ff6398c84.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 0d1fee5361..9d9d6e3bea 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3332,6 +3332,12 @@ options_validate(or_options_t *old_options, or_options_t *options, "PublishServerDescriptor line."); } + if (options->BridgeRelay && options->DirPort) { + log_warn(LD_CONFIG, "Can't set a DirPort on a bridge relay; disabling " + "DirPort"); + options->DirPort = 0; + } + if (options->MinUptimeHidServDirectoryV2 < 0) { log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at " "least 0 seconds. Changing to 0."); |