Merge remote branch 'origin/maint-0.2.2'

changes/bug2190

src/common/compat_libevent.c

src/common/log.c

src/common/torlog.h

src/or/main.c