commit 597cd893c557f8e05be98b6cade1b312fc6f0f8d Merge: 01407f9 7bb51fd Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 18 16:36:25 2013 -0400

Merge remote-tracking branch 'public/bug6174' into maint-0.2.4

changes/bug6174 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 12 +++++------- src/or/circuitlist.h | 2 +- src/or/circuituse.c | 36 +++++++++++++++++++++++++++++++++--- src/or/circuituse.h | 1 + src/or/config.c | 2 +- src/or/connection_edge.c | 18 ++++++------------ src/or/main.c | 4 ++-- src/or/or.h | 4 ++++ src/or/relay.c | 5 ++--- 11 files changed, 62 insertions(+), 30 deletions(-)