diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-04 13:50:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-04 13:50:24 -0500 |
| commit | 65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9 (patch) | |
| tree | 86e7a09ba27884359051963eb4097cc3a353413a /src/or/config.c | |
| parent | 47b7a279298c81137430527ed0a72c6a6d3fcd61 (diff) | |
| parent | 0bd53b8d87a5fd4691530b8cb54181037062b949 (diff) | |
| download | tor-65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9.tar.gz tor-65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9.zip | |
Merge remote-tracking branch 'rransom-tor/bug1297b-v2'
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 be4113f41a..740a9dbfd7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -306,6 +306,8 @@ static config_var_t _option_vars[] = { V(HidServAuth, LINELIST, NULL), V(HSAuthoritativeDir, BOOL, "0"), OBSOLETE("HSAuthorityRecordStats"), + V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"), + V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"), V(HTTPProxy, STRING, NULL), V(HTTPProxyAuthenticator, STRING, NULL), V(HTTPSProxy, STRING, NULL), |