Merge commit 'karsten/stats_v4_rebased'

changes/statsswitch

src/or/config.c

src/or/geoip.c

src/or/geoip.h

src/or/main.c

src/or/or.h

src/or/rephist.c

src/or/rephist.h

src/test/test.c