[tor-commits] [tor/master] Merge remote-tracking branch 'asn-mytor/bug5601'

[nickm at torproject.org]

commit 2d24994d166f6d89a685b83a9021c360cd828905
Merge: bd7724a 3226780
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 19 17:53:19 2012 -0400

    Merge remote-tracking branch 'asn-mytor/bug5601'

 src/or/circuitbuild.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)