commit 4acfc8d4b296807ef3b5e7b2b157a40666f81baa Merge: 66cad7e97 70a07fa90 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)