commit b6a5376b9ce8dcbed626a38809990b9f968f1cb9 Merge: 271bfc9 c468df3 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 19 12:31:29 2016 -0500 Merge branch 'bug21007' src/or/circuitbuild.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)