commit c32108ee0fea851ced14f71d842390992f762393 Merge: ae4e5b982 e0809ec5f Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 17 09:14:44 2018 -0400

Merge remote-tracking branch 'public/bug24688'

changes/bug24688 | 3 +++ src/common/timers.c | 5 +++++ 2 files changed, 8 insertions(+)