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

[nickm at torproject.org]

commit 438a03ef7c1aec6a9a92a74dafe127fa3f52a4e6
Merge: 125c8e5 3fc0f9e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 16 15:37:19 2014 -0400

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

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