Merge branch 'maint-0.4.8'

This commit is contained in:
David Goulet 2024-04-30 15:34:11 -04:00
commit 7a5d94bcf8

View File

@ -178,7 +178,7 @@ conflux_is_enabled(const circuit_t *circ)
log_warn(LD_GENERAL,
"This tor is a relay and ConfluxEnabled is set to 0. "
"We would ask you to please write to us on "
"tor-relay@lists.torproject.org or file a bug explaining "
"tor-relays@lists.torproject.org or file a bug explaining "
"why you have disabled this option. Without news from you, "
"we might end up marking your relay as a BadExit.");
tor_free(msg);