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