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

[nickm at torproject.org]

commit df4693fed57d0a0026186beaa6bb819b854c5b10
Merge: 3d817fa 2c7ed04
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 10 11:24:16 2013 -0400

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

 changes/bug9644     |    4 ++++
 src/or/routerlist.c |   29 ++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)