Merge branch 'typecheck4'

changes/ticket23643

src/or/circuitstats.c

src/or/config.c

src/or/confparse.h

src/or/or.h

src/or/shared_random_state.c

src/or/shared_random_state.h

src/or/statefile.c