Merge branch 'split_or_h'

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

diff --cc src/or/or.h
Simple merge

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

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