[tor-commits] [tor/master] Merge branch 'bug2798'

[nickm at torproject.org]

commit 597da4989e6f6a9c1a12ad3197dd6532b1a80035
Merge: b55e31a d823846
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 11 17:04:21 2011 -0400

    Merge branch 'bug2798'

 changes/bug2798       |   10 +++++++
 src/or/circuitbuild.c |   63 ++++++++++++++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 24 deletions(-)