Merge commit 'karsten/fix-bridge-stats-master-4'

ChangeLog

doc/spec/control-spec.txt

doc/spec/dir-spec.txt

src/common/compat_libevent.c

src/common/util.c

src/common/util.h

src/or/connection.c

src/or/connection_or.c

src/or/control.c

src/or/geoip.c

src/or/main.c

src/or/or.h

src/or/rephist.c

src/or/router.c

src/or/routerlist.c

src/or/routerparse.c

src/test/test_util.c