diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-20 14:26:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-20 14:26:22 -0400 |
| commit | a87f22ef6499818c1ff32f30c66e2e18d1e80ddf (patch) | |
| tree | 86d3dfcfb6aa8239f04efe778a9fc52944c1e0a4 /src/or/config.c | |
| parent | 63a42b38b1ea6c9f1899c6a600363a332d438597 (diff) | |
| parent | 5c5198e713365fecf44741ae6f287c2ebdef18f6 (diff) | |
| download | tor-a87f22ef6499818c1ff32f30c66e2e18d1e80ddf.tar.gz tor-a87f22ef6499818c1ff32f30c66e2e18d1e80ddf.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
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 f03f3802fc..75805d0ce8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -341,6 +341,8 @@ static config_var_t option_vars_[] = { V(PerConnBWRate, MEMUNIT, "0"), V(PidFile, STRING, NULL), V(TestingTorNetwork, BOOL, "0"), + V(TestingMinExitFlagThreshold, MEMUNIT, "0"), + V(TestingMinFastFlagThreshold, MEMUNIT, "0"), V(OptimisticData, AUTOBOOL, "auto"), V(PortForwarding, BOOL, "0"), V(PortForwardingHelper, FILENAME, "tor-fw-helper"), |