diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-30 16:22:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-30 16:22:39 -0400 |
| commit | 495e630a498fc4121a9852cad100af41e708cd4c (patch) | |
| tree | 7c5209ab9c5a6544b47ee081190262a86891c793 /src/or/config.c | |
| parent | d39e46c26d6992dcd019fa159981c057c3d24716 (diff) | |
| parent | 0e9d969bb2bb4bb9a5f7db1db824c729d7142cbc (diff) | |
| download | tor-495e630a498fc4121a9852cad100af41e708cd4c.tar tor-495e630a498fc4121a9852cad100af41e708cd4c.tar.gz | |
Merge branch 'tor-fw-squashed2'
Conflicts:
src/common/util.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 23cad9268..4f7077153 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -317,6 +317,8 @@ static config_var_t _option_vars[] = { V(PerConnBWRate, MEMUNIT, "0"), V(PidFile, STRING, NULL), V(TestingTorNetwork, BOOL, "0"), + V(PortForwarding, BOOL, "0"), + V(PortForwardingHelper, FILENAME, "tor-fw-helper"), V(PreferTunneledDirConns, BOOL, "1"), V(ProtocolWarnings, BOOL, "0"), V(PublishServerDescriptor, CSV, "1"), |