commit 196be8ca2648d4f4d43b83d0b4fce062d0b320a6 Merge: 1371d29e5 cf79ffaf1 Author: David Goulet dgoulet@torproject.org Date: Thu Nov 14 12:59:28 2019 -0500

Merge branch 'tor-github/pr/1537'

src/test/test_circuitmux.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)