commit 8ddf4e218e24167d1c595b74af62dd83b60d99a7 Merge: 804be10 3340d32 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 19 15:02:22 2013 -0500 Merge branch 'bug8065_v2' changes/bug8065 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/circuitbuild.h | 1 + src/or/connection_edge.c | 11 ++++++++++- 4 files changed, 18 insertions(+), 2 deletions(-)