commit c02f2d9eb45786c552dcc33c102e9964d95f66c1 Merge: 198b6354e 73a37d1e5 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)