commit 5acbcf150e7c75f0a9bf6e9d8a4f6f5bec7d549a Merge: 152e4a1e5 38cb638c3 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 20 07:53:22 2018 -0400

Merge branch 'maint-0.3.4'

changes/bug26196 | 7 +++++++ configure.ac | 1 + src/test/test.h | 2 ++ src/test/test_bridges.c | 6 +----- 4 files changed, 11 insertions(+), 5 deletions(-)