commit bd1302a37fea363ab6e85054604830b4cf00d4cf Merge: 4acfc8d4b b40f9967f Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)