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

[nickm at torproject.org]

commit 68ea7d24d8e1ceb594ae5a63a3d433bd78a079cd
Merge: 6e89d29 cab5f82
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 24 22:05:41 2013 -0400

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

 changes/bug8253-fix   |    6 ++++++
 src/or/circuitbuild.c |    4 ++--
 src/or/entrynodes.c   |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)