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

[nickm at torproject.org]

commit bbc9ff160e7071b7a2fa9ab200b6496580975b06
Merge: 8a7767603 c9b3f6352
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 3 08:59:59 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

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