From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Oct 2017 17:10:17 +0000 (-0400)
Subject: Fix: when BridgeRelay is set, you do not get any exit policy.
X-Git-Tag: tor-0.3.3.1-alpha~281^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e2f8de62d8e4ba440ae37e091651f075a0bf665;p=thirdparty%2Ftor.git

Fix: when BridgeRelay is set, you do not get any exit policy.
---

diff --git a/src/or/policies.c b/src/or/policies.c
index 3ff2b4aa3b..0dfbd92097 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -2118,12 +2118,11 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options,
     parser_cfg |= EXIT_POLICY_REJECT_PRIVATE;
   }
 
-  if (!or_options->BridgeRelay && !or_options->ReducedExitPolicy) {
-    parser_cfg |= EXIT_POLICY_ADD_DEFAULT;
-  }
-
-  if (or_options->ReducedExitPolicy) {
-    parser_cfg |= EXIT_POLICY_ADD_REDUCED;
+  if (!or_options->BridgeRelay) {
+    if (or_options->ReducedExitPolicy)
+      parser_cfg |= EXIT_POLICY_ADD_REDUCED;
+    else
+      parser_cfg |= EXIT_POLICY_ADD_DEFAULT;
   }
 
   if (or_options->ExitPolicyRejectLocalInterfaces) {