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

[nickm at torproject.org]

commit fd8ee1d7c335a02a6fd29cd1a826037efe28e100
Merge: 2484d1eb3 6ba2881ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 24 12:09:07 2018 -0500

    Merge branch 'maint-0.3.2'

 changes/bug25005          | 4 ++++
 src/test/test_scheduler.c | 1 +
 2 files changed, 5 insertions(+)