[tor-commits] [tor/master] Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4()