diff --git a/changes/bug40884 b/changes/bug40884 new file mode 100644 index 0000000000000000000000000000000000000000..8f2af04fcb6de9df6c533871101acb4825087d7a --- /dev/null +++ b/changes/bug40884 @@ -0,0 +1,3 @@ + o Minor bugfixes (bridge): + - Don't warn when BridgeRelay is 1 and ExitRelay is explicitly set to 0. + Fixes bug 40884; bugfix on 0.4.8.3-rc. diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index 0b02461318ef3db55651961911f1be646137e5e0..320ce8d13a39d8c3adc5576dcb84212ebaca6cf8 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.");