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

[nickm at torproject.org]

commit aa584fd3a3888de836bb5c23b7372676c557a735
Merge: 860c4fc 93be3a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 12:04:36 2012 -0400

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

 changes/pathsel-BUGGY-a |   14 ++++++++++++++
 src/or/routerlist.c     |   24 +++++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)