diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-03-11 22:16:25 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-03-19 16:04:40 -0400 |
commit | 18752bca5b57c11b6d843db671e1886ed0624848 (patch) | |
tree | 61c96b758758c5f59cf15d201dc03fa7f1079787 /src/or | |
parent | cf734a08f60f141ce2c21c703a403aeb74017b1f (diff) | |
download | tor-18752bca5b57c11b6d843db671e1886ed0624848.tar tor-18752bca5b57c11b6d843db671e1886ed0624848.tar.gz |
Drop the minimum guard lifetime back down to one month
Mike believes that raising the default to 2 months with no way to lower
it may create horrible load-balancing issues.
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/circuitbuild.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f07d42882..d3a29fd0e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4290,13 +4290,15 @@ entry_guard_free(entry_guard_t *e) /** * Return the minimum lifetime of working entry guard, in seconds, - * as given in the consensus networkstatus. + * as given in the consensus networkstatus. (Plus CHOSEN_ON_DATE_SLOP, + * so that we can do the chosen_on_date randomization while achieving the + * desired minimum lifetime.) */ static int32_t guards_get_lifetime(void) { const or_options_t *options = get_options(); -#define DFLT_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define DFLT_GUARD_LIFETIME (86400 * 30) /* One month. */ #define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */ #define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */ |