Merge commit 'karsten/bufferstats-master'

ChangeLog

configure.in

src/or/circuitlist.c

src/or/config.c

src/or/main.c

src/or/or.h

src/or/relay.c

src/or/rephist.c