commit 38cb638c325bc2612befc8176c545b1bcae9834f Merge: ac1747e47 ce9b9cc18 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 20 07:50:00 2018 -0400 Merge branch 'rl1987_bug26196_rebased_034' into 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(-)