Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson
2011-05-05 21:54:04 -04:00
3 changed files with 4 additions and 7 deletions
-1
View File
@@ -2163,7 +2163,6 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf,
return r;
}
/** @{ */
/** As localtime_r, but defined for platforms that don't have it:
*