commit 4eaca17f2f755cb1aca9a20216002a4ad652d7ef Merge: 597cd89 73a35dc Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 19 12:29:29 2013 -0400 Merge branch 'bug7582_v2' into maint-0.2.4 changes/bug7582 | 9 ++++++ src/or/circuitlist.c | 2 + src/or/circuituse.c | 13 +++++++-- src/or/nodelist.c | 18 +++++++++++++ src/or/nodelist.h | 1 + src/or/or.h | 4 +++ src/or/policies.c | 18 +++++++++++++ src/or/policies.h | 2 + src/or/relay.c | 68 +++++++++++++++++++++++++++++++++++++++---------- 9 files changed, 118 insertions(+), 17 deletions(-)