Merge branch 'decouple_controller_events_squashed'

changes/decouple_control_events

src/common/compat_pthreads.c

src/common/compat_threads.h

src/common/compat_winthreads.c

src/or/config.c

src/or/control.c

src/or/control.h

src/or/main.c

src/test/test_controller_events.c

src/test/test_hs.c

src/test/test_pt.c

src/test/test_threads.c

src/test/testing_common.c