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.

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 5bb0a7317cd9d9b574a493bad119e89e08258cfb..6b21d1092b0bf3d4cd4f72a710b4019aa970c102 100644 (file)
--- 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) {