commit fd9961d220504f81204ab5ad0204cfec8abdb75e Merge: 47a0c10 985deaa Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 18 13:23:44 2014 -0400 Merge remote-tracking branch 'public/bug11553_024' into bug11553_025 src/or/circuitbuild.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)