Merge branch 'maint-0.4.1'

This commit is contained in:
Nick Mathewson 2019-07-25 16:57:32 -04:00
commit 69921a6a8a

View File

@ -631,7 +631,7 @@ mock_clock_skew_warning(const connection_t *conn, long apparent_skew,
(void)conn;
mock_apparent_skew = apparent_skew;
tt_int_op(trusted, OP_EQ, 1);
tt_int_op(domain, OP_EQ, LD_GENERAL);
tt_i64_op(domain, OP_EQ, LD_GENERAL);
tt_str_op(received, OP_EQ, "microdesc flavor consensus");
tt_str_op(source, OP_EQ, "CONSENSUS");
done: