[tor-commits] [tor/master] config: Obsolete PortForwarding and PortForwardingHelper options.

[nickm at torproject.org]

commit 65d6b66e99a1a441805402ba8f275a63bccbf0f5
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Apr 10 19:08:57 2018 +0000

    config: Obsolete PortForwarding and PortForwardingHelper options.
    
     * FIXES part of #25409: https://bugs.torproject.org/25409
---
 src/or/config.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/or/config.c b/src/or/config.c
index a0890e278..b2cb1f407 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"),