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

[nickm at torproject.org]

commit a9d56289ee53da6aa98a0c8b89796b7872ff6e1a
Merge: 851197f 9ed87b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 15:59:40 2012 -0400

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

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