Merge branch 'bug23539_032_01_squashed'

changes/bug23539

src/or/or.h

src/or/scheduler.c

src/or/scheduler.h

src/or/scheduler_kist.c

src/test/test_scheduler.c