mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Merge branch 'maint-0.2.9' into maint-0.3.0
This commit is contained in:
commit
7c68b2f1a5
5
changes/bug22245
Normal file
5
changes/bug22245
Normal file
@ -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.
|
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user