commit 1ca03633fe47273e95595d03a9fd086fbf9d9c71 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 14 09:32:39 2018 -0400

Tweak message; only log it on a relay. --- src/core/or/policies.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/or/policies.c b/src/core/or/policies.c index 1c9c9b075..3cb5e5359 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -1165,13 +1165,14 @@ validate_addr_policies(const or_options_t *options, char **msg)

static int warned_about_nonexit = 0;

- if (!warned_about_nonexit && options->ExitPolicy == NULL && + if (public_server_mode(options) && + !warned_about_nonexit && options->ExitPolicy == NULL && options->ExitRelay == -1 && options->ReducedExitPolicy == 0) { warned_about_nonexit = 1; log_notice(LD_CONFIG, "By default, Tor does not run as an exit relay. " - "The reason is to prevent your relay from appearing as the " - "source of abusive traffic. If you want to be an exit relay, " - "set ExitRelay to 1."); + "If you want to be an exit relay, " + "set ExitRelay to 1. To suppress this message in the future, " + "set ExitRelay to 0."); }

/* The rest of these calls *append* to addr_policy. So don't actually