commit 9ba12d1a1e938824cd499b65263fe159657df752 Merge: d96cef1ba c02f2d9eb Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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