commit 677bebda7005ca9df960a4691c58f2cebb05035f Merge: 03eb2037d 6ba2881ae Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 24 12:09:07 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25005 | 4 ++++ src/test/test_scheduler.c | 1 + 2 files changed, 5 insertions(+)