[or-cvs] [tor/release-0.2.2] Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2

[arma at torproject.org]

commit cdbd6d0fe88ed305bff33388439297474b27f352
Merge: 029ca80 cc051f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 21 15:48:14 2010 -0500

    Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2

 changes/bug2190              |   11 ++++++
 src/common/compat_libevent.c |   10 +++---
 src/common/log.c             |   74 +++++++++++++++++++++++++++++++++++++++++-
 src/common/torlog.h          |    5 +++
 src/or/main.c                |    3 ++
 5 files changed, 97 insertions(+), 6 deletions(-)