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

[nickm at torproject.org]

commit c1d98c75e305eaf63e81903ca5a4eb68dcae515b
Merge: fb5877b97 bbc9ff160
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 3 08:59:59 2018 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

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