Merge remote-tracking branch 'origin/maint-0.2.2'

src/common/compat_libevent.c

src/or/config.c

src/or/relay.c

src/or/relay.h

src/or/rephist.c

src/or/routerparse.h