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

[nickm at torproject.org]

commit c9b3f6352f68a03b5380db0e459a8cd6407c5603
Merge: 6e5e4f92a accd0ea65
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 3 08:59:52 2018 -0500

    Merge branch 'bug24633_029' into maint-0.2.9

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