[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit e3a6493898fdca78b3b562f7cf870a26be526f70
Merge: 2b189a2 c563551
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 28 15:57:48 2011 -0500

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

 changes/bug4786 |    9 +++++++++
 src/or/relay.c  |    4 ----
 2 files changed, 9 insertions(+), 4 deletions(-)