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

[nickm at torproject.org]

commit ed304a052f0d6575495999e516e464d34ea5f0e2
Merge: a8a060cdb c1d98c75e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 3 09:00:00 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

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