diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-10 15:27:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-10 15:27:09 -0400 |
| commit | 6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a (patch) | |
| tree | 590e8ba5ba6685695bde42d7fce79e78226f55ca /src/or/config.c | |
| parent | ef16a11b90a107c6bc5178af1cbd083f80b39842 (diff) | |
| parent | 550037f67779fc52d08a12c5f4ffdd04d55841a9 (diff) | |
| download | tor-6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a.tar.gz tor-6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a.zip | |
Merge remote-tracking branch 'isis-github/bug25409'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/or/config.c b/src/or/config.c index bf88a83ee8..9cd66cbf63 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -492,8 +492,8 @@ static config_var_t option_vars_[] = { V(TestingSigningKeySlop, INTERVAL, "1 day"), V(OptimisticData, AUTOBOOL, "auto"), - V(PortForwarding, BOOL, "0"), - V(PortForwardingHelper, FILENAME, "tor-fw-helper"), + OBSOLETE("PortForwarding"), + OBSOLETE("PortForwardingHelper"), OBSOLETE("PreferTunneledDirConns"), V(ProtocolWarnings, BOOL, "0"), V(PublishServerDescriptor, CSV, "1"), @@ -3879,15 +3879,6 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); - if (options->PortForwarding && options->Sandbox) { - REJECT("PortForwarding is not compatible with Sandbox; at most one can " - "be set"); - } - if (options->PortForwarding && options->NoExec) { - COMPLAIN("Both PortForwarding and NoExec are set; PortForwarding will " - "be ignored."); - } - if (ensure_bandwidth_cap(&options->BandwidthRate, "BandwidthRate", msg) < 0) return -1; |