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

[nickm at torproject.org]

commit ea6d53e7246cb66efc054b5f5a235000c528eff5
Merge: 7c2eabc 6196d0e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 21 07:25:24 2013 -0400

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

 src/or/entrynodes.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)