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

[nickm at torproject.org]

commit a3046fd5e576bc7294374a8bbab1a80cd3fb3524
Merge: ee246bb 3ed4c5d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 10:57:08 2012 -0400

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

 changes/routerlist_ins_replace |    5 +++++
 src/or/routerlist.c            |    7 +++++++
 2 files changed, 12 insertions(+), 0 deletions(-)