commit 1a070767de0c50aed86f5fc3dc04324e03ef3d32 Merge: 99b4f8683 451c852a0 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 3 09:00:00 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)