commit 67c88fd10dd74d03161ec61aac4cdc4ce31bf29d Merge: 2c001b4 f0a57df Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 3 11:58:37 2017 -0400

Merge branch 'bug13790_rebased'

src/or/circuitbuild.c | 102 ++++++++++++++++++++++++++++++---- src/or/circuitbuild.h | 3 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_circuitbuild.c | 128 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 225 insertions(+), 11 deletions(-)