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

[nickm at torproject.org]

commit 978cfcfbbb9d7960d081fd1eb26b0706cb296f3c
Merge: d4526e1 8abfcc0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 9 14:25:18 2012 -0500

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

 src/or/routerlist.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)