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.
This commit is contained in:
Nick Mathewson 2013-03-21 07:22:59 -04:00
parent 3412054987
commit 6196d0e83d

View file

@ -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) {