[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 02a4c641da4497b77ded4123c4550a583916eff2
Merge: 306d1fb60 bebdd9105
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 6 10:16:19 2017 -0500

    Merge branch 'maint-0.3.2'

 src/or/scheduler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)