tor

commit 1665d1194263ac595cf6ad24cb38d80c7ec446a5
parent b3d7a56f2a9ed617c6e22c21544a0a6ceb7b2668
Author: Alexander Færøy <ahf@torproject.org>
Date:   Tue, 25 May 2021 14:17:12 +0000

Merge remote-tracking branch 'tor-gitlab/mr/388' into main

Diffstat:
A
changes/bug40394
 | 
4
++++
M
src/feature/stats/rephist.c
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug40394 b/changes/bug40394
@@ -0,0 +1,4 @@
+  o Minor bugfixes (statistics):
+    - Fix the fencepost issue when we check stability_last_downrated where
+      we call rep_hist_downrate_old_runs() twice. Fixes bug 40394; bugfix
+      on 0.2.0.5-alpha. Patch by Neel Chauhan.
diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c
@@ -731,7 +731,7 @@ rep_hist_downrate_old_runs(time_t now)
     return stability_last_downrated + STABILITY_INTERVAL;
 
   /* Okay, we should downrate the data.  By how much? */
-  while (stability_last_downrated + STABILITY_INTERVAL < now) {
+  while (stability_last_downrated + STABILITY_INTERVAL <= now) {
     stability_last_downrated += STABILITY_INTERVAL;
     alpha *= STABILITY_ALPHA;
   }