commit 7601edc29a1c17344bea648b56c1b26fc9ba322c Merge: 3e4a1ed d01a6c0 Author: Nick Mathewson nickm@torproject.org Date: Sun Dec 11 21:19:03 2016 -0500

Merge remote-tracking branch 'dgoulet/bug20936_030_01'

src/test/test_circuituse.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)