Merge branch 'v0.18.x'

This commit is contained in:
Max Kellermann
2014-08-24 13:15:17 +02:00
3 changed files with 13 additions and 0 deletions

View File

@@ -51,5 +51,6 @@ TimeoutMonitor::ScheduleSeconds(unsigned s)
void
TimeoutMonitor::Run()
{
active = true;
OnTimeout();
}