[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[arma at torproject.org]

commit f050cf75b0d963be1aa2840bcef60c8b1e96d3b6
Merge: f3c20a2 2ce0750
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 16 13:32:20 2014 -0400

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

 src/or/routerlist.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)