nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2011-04-28 20:03:57 -04:00
commit c122897925
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug3020 Normal file
View File

@ -0,0 +1,7 @@
o Minor bugfixes:
- When checking whether a hibernation period has fully elapsed, use
the amount of seconds we expect for that period instead of using
the new period that just started. This would cause an issue because
February is a really short month. Bugfix on 0.2.2.17-alpha;
fixes bug 3020.

3
src/or/hibernate.c
View File

@ -378,7 +378,8 @@ configure_accounting(time_t now)
/* We are in the interval we thought we were in. Do nothing.*/
interval_end_time = start_of_accounting_period_after(interval_start_time);
} else {
long duration = length_of_accounting_period_containing(now);
long duration =
length_of_accounting_period_containing(interval_start_time);
double delta = ((double)(s_now - interval_start_time)) / duration;
if (-0.50 <= delta && delta <= 0.50) {
/* The start of the period is now a little later or earlier than we