Merge branch 'maint-0.3.2'

diff --cc src/or/scheduler.c
Simple merge

diff --cc src/test/test_scheduler.c
Simple merge