summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug230916
-rw-r--r--src/or/main.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug23091 b/changes/bug23091
new file mode 100644
index 0000000000..7dfb7e4180
--- /dev/null
+++ b/changes/bug23091
@@ -0,0 +1,6 @@
+ o Minor bugfixes (consensus expiry):
+ - Tor would reconsider updating its directory information every 2 minutes
+ instead of only doing it for a consensus that is more than 24 hours old
+ (badly expired). This specific check is done in the tor main loop
+ callback that validates if we have an expired consensus. Fixes bug
+ 23091; bugfix on tor-0.2.0.19-alpha.
diff --git a/src/or/main.c b/src/or/main.c
index 42d984acfb..86fdb93282 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1709,7 +1709,7 @@ check_expired_networkstatus_callback(time_t now, const or_options_t *options)
* networkstatus_get_reasonably_live_consensus(), but that value is way
* way too high. Arma: is the bridge issue there resolved yet? -NM */
#define NS_EXPIRY_SLOP (24*60*60)
- if (ns && ns->valid_until < now+NS_EXPIRY_SLOP &&
+ if (ns && ns->valid_until < (now - NS_EXPIRY_SLOP) &&
router_have_minimum_dir_info()) {
router_dir_info_changed();
}