diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-21 07:25:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-21 07:25:24 -0400 |
| commit | ea6d53e7246cb66efc054b5f5a235000c528eff5 (patch) | |
| tree | 113e38b9a44476c5de3bd4db5ba87a12341e2c17 /src/or/entrynodes.c | |
| parent | 7c2eabcf8e68aee149bff1d5c9f11eff14152bc7 (diff) | |
| parent | 6196d0e83d78e2e8efff575d490f4cb254415832 (diff) | |
| download | tor-ea6d53e7246cb66efc054b5f5a235000c528eff5.tar tor-ea6d53e7246cb66efc054b5f5a235000c528eff5.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index b35e4d8ef..1ce78e512 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -463,8 +463,8 @@ static int32_t guards_get_lifetime(void) { const or_options_t *options = get_options(); -#define DFLT_GUARD_LIFETIME (86400 * 30) /* One month. */ -#define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define DFLT_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define MIN_GUARD_LIFETIME (86400 * 30) /* One months. */ #define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */ if (options->GuardLifetime >= 1) { |