commit 811280013848536e6907b5880f30c75202170044 Merge: 9282355 3a60214 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 28 08:28:55 2017 -0500 Merge branch 'maint-0.3.0' changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)