commit 103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542 Merge: 2e54c80ae 0483f7f64 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.4'

changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)