tor

commit 2b94b0ea721f2bd0127d097860ef64b915e2781a
parent f6ecda84005cc436c656e5fc7ed5b6dfe71a6ca8
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  1 Aug 2017 11:22:42 -0400

Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9

Diffstat:
A
changes/bug22245
 | 
5
+++++
M
src/or/hibernate.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug22245 b/changes/bug22245
@@ -0,0 +1,5 @@
+  o Minor bugfixes (bandwidth accounting):
+    - Roll over monthly accounting at the configured hour and minute,
+      rather than always at 00:00.
+      Fixes bug 22245; bugfix on 0.0.9rc1.
+      Found by Andrey Karpov with PVS-Studio.
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
@@ -331,7 +331,7 @@ edge_of_accounting_period_containing(time_t now, int get_end)
     case UNIT_MONTH: {
       /* If this is before the Nth, we want the Nth of last month. */
       if (tm.tm_mday < cfg_start_day ||
-          (tm.tm_mday < cfg_start_day && before)) {
+          (tm.tm_mday == cfg_start_day && before)) {
         --tm.tm_mon;
       }
       /* Otherwise, the month is correct. */