aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-21 07:22:59 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-21 07:22:59 -0400
commit6196d0e83d78e2e8efff575d490f4cb254415832 (patch)
treed8277d6a4e649df9fad7ca8a5db514eca959bf6e
parent34120549878aa05969b66d9564cdd902adeeb6be (diff)
downloadtor-6196d0e83d78e2e8efff575d490f4cb254415832.tar.gz
tor-6196d0e83d78e2e8efff575d490f4cb254415832.zip
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.
-rw-r--r--src/or/entrynodes.c4
1 files changed, 2 insertions, 2 deletions
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) {