commit cab5f82d125d721fa4b73568323ac1b6009002c3 Merge: b933360 ac22bf2 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 24 22:04:15 2013 -0400

Merge branch 'bug8235-fix-rebased' into 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(-)