From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Oct 2017 17:22:28 +0000 (-0400)
Subject: Don't give "exitrelay may become 0 when no policy" warning on ReducedExitPolicy
X-Git-Tag: tor-0.3.3.1-alpha~281^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00e781142b919476fd1ea594ac36b08147c20ede;p=thirdparty%2Ftor.git

Don't give "exitrelay may become 0 when no policy" warning on ReducedExitPolicy
---

diff --git a/src/or/policies.c b/src/or/policies.c
index 0dfbd92097..1f80130710 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -1145,7 +1145,7 @@ validate_addr_policies(const or_options_t *options, char **msg)
              "to 1 to disable this warning, and for forward compatibility.",
              options->ExitPolicy == NULL ?
                  " with the default exit policy" : "");
-    if (options->ExitPolicy == NULL) {
+    if (options->ExitPolicy == NULL && options->ReducedExitPolicy == 0) {
       log_warn(LD_CONFIG,
                "In a future version of Tor, ExitRelay 0 may become the "
                "default when no ExitPolicy is given.");