[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

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