From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Mar 2013 11:22:59 +0000 (-0400)
Subject: The *default* guard lifetime is two months; the *min* is one
X-Git-Tag: tor-0.2.5.1-alpha~241^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6196d0e83d78e2e8efff575d490f4cb254415832;p=thirdparty%2Ftor.git

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 5bb0a7317c..6b21d1092b 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) {