summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-11 09:39:57 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-11 09:39:57 -0400
commit133e1e870bd59e3a89d5a7712983d3f9bf35f7c3 (patch)
tree3a587a1b1aaad5244ece05c36dfecad30c54d359 /src/or/main.c
parent77bb85ba873425b6c7b48d4c93bde1f434a37314 (diff)
parent5b03c7ba6d899e19e8f3e0a58bd5df8bb7bbf1d0 (diff)
downloadtor-133e1e870bd59e3a89d5a7712983d3f9bf35f7c3.tar.gz
tor-133e1e870bd59e3a89d5a7712983d3f9bf35f7c3.zip
Merge remote-tracking branch 'dgoulet/bug23091_032_01'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
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();
}