commit d44eb16b23829299f154e46984bf4be0d5036dea Merge: 4b646e30d 3ddfd5ff2 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.4'

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