From: Isis Lovecruft <isis@torproject.org>
Date: Tue, 10 Apr 2018 19:08:57 +0000 (+0000)
Subject: config: Obsolete PortForwarding and PortForwardingHelper options.
X-Git-Tag: tor-0.3.4.1-alpha~168^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65d6b66e99a1a441805402ba8f275a63bccbf0f5;p=thirdparty%2Ftor.git

config: Obsolete PortForwarding and PortForwardingHelper options.

 * FIXES part of #25409: https://bugs.torproject.org/25409
---

diff --git a/src/or/config.c b/src/or/config.c
index a0890e2786..b2cb1f407e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -492,6 +492,8 @@ static config_var_t option_vars_[] = {
   V(TestingSigningKeySlop,           INTERVAL, "1 day"),
 
   V(OptimisticData,              AUTOBOOL, "auto"),
+  OBSOLETE("PortForwarding"),
+  OBSOLETE("PortForwardingHelper"),
   OBSOLETE("PreferTunneledDirConns"),
   V(ProtocolWarnings,            BOOL,     "0"),
   V(PublishServerDescriptor,     CSV,      "1"),