Merge branch 'maint-0.3.2'

This commit is contained in:
Nick Mathewson
2018-01-03 10:09:20 -05:00
4 changed files with 20 additions and 17 deletions
+3 -3
View File
@@ -971,12 +971,12 @@ helper_init_service(time_t now)
/* Helper function to set the RFC 1123 time string into t. */
static void
set_consensus_times(const char *time, time_t *t)
set_consensus_times(const char *timestr, time_t *t)
{
tt_assert(time);
tt_assert(timestr);
tt_assert(t);
int ret = parse_rfc1123_time(time, t);
int ret = parse_rfc1123_time(timestr, t);
tt_int_op(ret, OP_EQ, 0);
done: