diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-11-22 15:02:14 +0000 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-11-22 15:02:14 +0000 |
| commit | d07810a3c96b7c063696fd3a27d9ad09f5141135 (patch) | |
| tree | 2c651a7ddadd199671a22cad3f50357187ee879d /src | |
| parent | 0ea2e15d84c375a36b9f6a471b21ca6537f78fc3 (diff) | |
| parent | 42742d55c725a236cfedd362ac37517742abcb5e (diff) | |
| download | tor-d07810a3c96b7c063696fd3a27d9ad09f5141135.tar.gz tor-d07810a3c96b7c063696fd3a27d9ad09f5141135.zip | |
Merge branch 'fix-bridge-exit-warn' into 'main'
Fix bridge exit warn
Closes #40884
See merge request tpo/core/tor!783
Diffstat (limited to 'src')
| -rw-r--r-- | src/feature/relay/relay_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index 0b02461318..320ce8d13a 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -1151,8 +1151,8 @@ options_validate_relay_mode(const or_options_t *old_options, REJECT("BridgeRelay is 1, ORPort is not set. This is an invalid " "combination."); - if (options->BridgeRelay == 1 && (options->ExitRelay == 1 || - !policy_using_default_exit_options(options))) { + if (options->BridgeRelay == 1 && !(options->ExitRelay == 0 || + policy_using_default_exit_options(options))) { log_warn(LD_CONFIG, "BridgeRelay is 1, but ExitRelay is 1 or an " "ExitPolicy is configured. Tor will start, but it will not " "function as an exit relay."); |