[tor-commits] [tor/release-0.2.8] Merge branch 'bug18977_024_v2' into bug18977_026_v2

[nickm at torproject.org]

commit 20b01cece8cd2ceb7f8051aee04294bdba471f1a
Merge: 0b477bf e57f26c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 14:39:06 2016 -0400

    Merge branch 'bug18977_024_v2' into bug18977_026_v2
    
    Had conflicts related to other correct_tm bugs in 0.2.6.  Added wday
    for another case.

 changes/bug18977    | 4 ++++
 src/common/compat.c | 4 ++++
 src/common/util.c   | 2 ++
 3 files changed, 10 insertions(+)

diff --cc src/common/compat.c
index 1788e32,90132fc..103ce24
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@@ -2683,18 -2461,11 +2683,20 @@@ correct_tm(int islocal, const time_t *t
        r->tm_year = 8099;
        r->tm_mon = 11;
        r->tm_mday = 31;
 -      r->tm_yday = 365;
 +      r->tm_yday = 364;
+       r->tm_wday = 6;
        r->tm_hour = 23;
        r->tm_min = 59;
        r->tm_sec = 59;
 +    } else if (r->tm_year < (1-1900)) {
 +      r->tm_year = (1-1900);
 +      r->tm_mon = 0;
 +      r->tm_mday = 1;
 +      r->tm_yday = 0;
++      r->tm_wday = 0;
 +      r->tm_hour = 0;
 +      r->tm_min = 0;
 +      r->tm_sec = 0;
      }
      return r;
    }
@@@ -2708,7 -2479,8 +2710,8 @@@
        r->tm_year = 70; /* 1970 CE */
        r->tm_mon = 0;
        r->tm_mday = 1;
 -      r->tm_yday = 1;
 +      r->tm_yday = 0;
+       r->tm_wday = 0;
        r->tm_hour = 0;
        r->tm_min = 0 ;
        r->tm_sec = 0;
@@@ -2721,7 -2493,8 +2724,8 @@@
        r->tm_year = 137; /* 2037 CE */
        r->tm_mon = 11;
        r->tm_mday = 31;
 -      r->tm_yday = 365;
 +      r->tm_yday = 364;
+       r->tm_wday = 6;
        r->tm_hour = 23;
        r->tm_min = 59;
        r->tm_sec = 59;