commit 45a93ac807e52a38d13c7fe7e695268ca06c4aec Merge: b2871cef9 c9b3f6352 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 3 08:59:59 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)