commit f96f4c0e4218ccba48e5b575020caca4f5e6576e Merge: 0ded723 2331e70 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 5 08:25:22 2016 -0500

Merge remote-tracking branch 'chelseakomlo/circuituse'

changes/ticket18873 | 7 ++ src/or/circuitbuild.c | 6 +- src/or/circuitbuild.h | 5 +- src/or/circuituse.c | 188 ++++++++++++++++++++-------- src/or/circuituse.h | 20 +++ src/or/nodelist.c | 4 +- src/or/nodelist.h | 3 +- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_circuituse.c | 302 +++++++++++++++++++++++++++++++++++++++++++++ src/test/test_helpers.c | 23 ++++ src/test/test_helpers.h | 2 + src/test/test_oom.c | 19 +-- 14 files changed, 502 insertions(+), 80 deletions(-)