[tor-commits] [tor/master] Merge branch 'bug4655-squashed'

[nickm at torproject.org]

commit b7519dce98031c2adca3f0c8f28741a219845b6e
Merge: 7a76994 59b5379
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 9 11:29:03 2011 -0500

    Merge branch 'bug4655-squashed'

 changes/bug4655     |   10 +++++++++
 src/or/circuituse.c |   53 +++++++++++++++++++++++++++++++++-----------------
 src/or/circuituse.h |    1 +
 src/or/rendclient.c |    7 ++---
 4 files changed, 49 insertions(+), 22 deletions(-)