[tor-commits] [tor/master] Merge branch 'trac-5049-squashed'

[nickm at torproject.org]

commit e3a6e01fe196fa1c1ae707065d515718795bc1d1
Merge: 7826eef 5b0977d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 16:55:39 2012 -0400

    Merge branch 'trac-5049-squashed'

 changes/bug5049       |    4 +
 src/or/circuitbuild.c |  293 +++++++++++++++++++++++++++++++++++++++----------
 src/or/circuitbuild.h |    1 +
 src/or/circuituse.c   |    4 +-
 src/or/control.c      |    4 +-
 5 files changed, 245 insertions(+), 61 deletions(-)