commit 3a60214f32bc6e1ba6d8c6dd6c6abda0c5be1f1e Merge: 16f337e 5e08fc8 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 08:28:46 2017 -0500

Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0

changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)