summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-10 15:27:09 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-10 15:27:09 -0400
commit6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a (patch)
tree590e8ba5ba6685695bde42d7fce79e78226f55ca /src/or/or.h
parentef16a11b90a107c6bc5178af1cbd083f80b39842 (diff)
parent550037f67779fc52d08a12c5f4ffdd04d55841a9 (diff)
downloadtor-6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a.tar.gz
tor-6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a.zip
Merge remote-tracking branch 'isis-github/bug25409'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 25ad351751..541b709d89 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4200,10 +4200,6 @@ typedef struct {
* testing our DNS server. */
int EnforceDistinctSubnets; /**< If true, don't allow multiple routers in the
* same network zone in the same circuit. */
- int PortForwarding; /**< If true, use NAT-PMP or UPnP to automatically
- * forward the DirPort and ORPort on the NAT device */
- char *PortForwardingHelper; /** < Filename or full path of the port
- forwarding helper executable */
int AllowNonRFC953Hostnames; /**< If true, we allow connections to hostnames
* with weird characters. */
/** If true, we try resolving hostnames with weird characters. */