commit d21b24b3b6f4d8203c44cec7709a7f7a12a540df Merge: e616f5b 1068e50 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 24 13:05:25 2014 -0500

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

changes/feature9777 | 3 ++ src/or/circuitbuild.c | 77 +++++++++++++++++++++++++++++++++++++++++++------ src/or/circuitlist.c | 10 ++++++- src/or/circuitlist.h | 1 + 4 files changed, 81 insertions(+), 10 deletions(-)