diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-19 16:15:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-19 16:15:27 -0400 |
| commit | 6f20a74d52741cce521cf03b8afee570e3cb367b (patch) | |
| tree | c49d5aab8a038da07570612795861ea32bf6cb2d /src/or/config.c | |
| parent | a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0 (diff) | |
| parent | 18752bca5b57c11b6d843db671e1886ed0624848 (diff) | |
| download | tor-6f20a74d52741cce521cf03b8afee570e3cb367b.tar tor-6f20a74d52741cce521cf03b8afee570e3cb367b.tar.gz | |
Merge branch 'bug8240_v2_squashed' into maint-0.2.4
Conflicts:
doc/tor.1.txt
src/or/circuitbuild.c
src/or/config.c
src/or/or.h
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 0ebf3b694..68c0ccacd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -255,6 +255,7 @@ static config_var_t option_vars_[] = { #endif OBSOLETE("GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays"), OBSOLETE("Group"), + V(GuardLifetime, INTERVAL, "0 minutes"), V(HardwareAccel, BOOL, "0"), V(HeartbeatPeriod, INTERVAL, "6 hours"), V(AccelName, STRING, NULL), |