commit 6196d0e83d78e2e8efff575d490f4cb254415832 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 21 07:22:59 2013 -0400

The *default* guard lifetime is two months; the *min* is one

This caused an assertion failure when pruning guards.

Fixes bug #8553; bug not in any released Tor. --- 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 5bb0a73..6b21d10 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -459,8 +459,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) {