commit b62b40a572d8693daa5851eee5f423007535b3b6 Merge: bd9739bae 451c852a0 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 3 09:00:00 2018 -0500

Merge branch 'maint-0.3.2'

changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)