[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/866'

[teor at torproject.org]

commit e4692fad9680ffea938dd6024ceacfc1ba1edffa
Merge: 2dab7a107 c66df27c9
Author: teor <teor at torproject.org>
Date:   Tue Apr 9 11:36:38 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/866'

 src/ext/timeouts/.may_include   | 5 ++---
 src/ext/timeouts/test-timeout.c | 2 +-
 src/ext/timeouts/timeout.c      | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)