[tor-commits] [tor/master] Merge remote-tracking branch 'pastly/bug23581_032_03'

[nickm at torproject.org]

commit bb9b8e65bbab2f8a774898f1f8dccdce714301eb
Merge: 9af06bdd1 c20d4db7b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 21 17:33:10 2017 -0400

    Merge remote-tracking branch 'pastly/bug23581_032_03'

 changes/bug23581   |  4 ++++
 src/or/scheduler.c | 23 ++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)