commit af6fd83f74f6f39981cb32e1f871421755edfdaa Merge: dc003e8 f716fed Author: Damian Johnson <atagar@torproject.org> Date: Sun Dec 30 19:05:14 2012 -0800 Circuit attachment and getter defaults Originally I set out to merge in Ravi's branch for attach_stream (https://trac.torproject.org/7152) but this turned into an odyssey of general Controller improvements. The most notable bits (besides attach_stream) are... * All of the Controller's getter methods now support a 'default' argument. https://trac.torproject.org/7832 * Added methods to get circuits. This was part of Ravi's branch though I expanded it a bit. * The new_circuit() and extend_circuit() now have an 'await_build' option to block until the circuit is ready to be used. stem/__init__.py | 12 + stem/control.py | 765 ++++++++++++++++++++++++-------------- test/integ/control/controller.py | 93 ++++-- test/util.py | 25 +- 4 files changed, 576 insertions(+), 319 deletions(-)