commit 00d7b60557883ac0c3ad4c27071d4efe1f7a3ffb Merge: 6203047e1 33d44dc4a Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 21 17:39:54 2017 -0400

Merge branch 'bug21800'

changes/bug21800 | 4 ++++ src/test/test_util.c | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)