K 10
svn:author
V 8
jhibbits
K 8
svn:date
V 27
2017-04-04T02:37:41.204579Z
K 7
svn:log
V 188
Fix mis-manual merge.

Timeout is now effectively a boolean rather than a time-remaining.  This was
missed in r316478, but included in the original patch (mis-merged with a manual
merge).

END