[tor-commits] [tor/master] Merge branch 'bug23583_029'

[nickm at torproject.org]

commit ac73913d408dca1c2f12b153162cdc609d732684
Merge: 7581ac709 10ea3343b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 19 14:12:29 2017 -0400

    Merge branch 'bug23583_029'

 src/ext/timeouts/timeout-bitops.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)