diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:53:03 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:53:03 -0500 |
| commit | e895919b171029df4d38285b0be4483376b4ad25 (patch) | |
| tree | 769321cdeb36144b5674d1311955b60dad32df25 /src/or | |
| parent | cdbd6d0fe88ed305bff33388439297474b27f352 (diff) | |
| parent | 12f31867190bde6fb2c4ff169d343e7bff00a503 (diff) | |
| download | tor-e895919b171029df4d38285b0be4483376b4ad25.tar tor-e895919b171029df4d38285b0be4483376b4ad25.tar.gz | |
Merge remote branch 'public/bug2060' into maint-0.2.2
Diffstat (limited to 'src/or')
| -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 280acc0ca..7fea8500b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3281,6 +3281,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."); |