Commit 7c68b2f1 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.9' into maint-0.3.0

parents 1d48712c 2b94b0ea

changes/bug22245

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/or/hibernate.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */