commit a7a900685db464702b00d706c0688d53d8400f4a Merge: f5fea5934 0483f7f64 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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