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

commit f4f7e7a6f8a59fee532c5eca4cb71f2b28b5a1ad Merge: bd93ff8 42e3c04 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 7 10:35:41 2012 -0500

Merge branch 'bug3443_squashed'

changes/bug3443 | 11 +++++ src/or/circuitbuild.c | 14 +++++- src/or/circuitlist.c | 9 +++- src/or/circuitstats.c | 10 ++-- src/or/circuituse.c | 118 +++++++++++++++++++++++++++++++++++++++++-------- src/or/control.c | 4 +- src/or/entrynodes.c | 2 +- src/or/entrynodes.h | 1 + src/or/or.h | 21 +++++++- 9 files changed, 157 insertions(+), 33 deletions(-)