Browse Source

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

Nick Mathewson 6 years ago
parent
commit
2b94b0ea72
2 changed files with 6 additions and 1 deletions
  1. 5 0
      changes/bug22245
  2. 1 1
      src/or/hibernate.c

+ 5 - 0
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.

+ 1 - 1
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. */