commit 466276faa50c4cb31857dfea2ae9e1612aae3911 Merge: c1da29e 5dc9acb Author: Nick Mathewson nickm@torproject.org Date: Fri May 18 12:36:04 2012 -0400

Merge remote-tracking branch 'asn/bug5602'

src/or/circuitbuild.c | 15 +++++++++++++++ src/or/circuitbuild.h | 3 +++ src/or/connection_or.c | 23 +++++++++++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-)