commit b63d157b498669b3935b072f88f0fad64bcb8b1e Merge: d1a9f6de9 6e0872e86 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)