commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457 Merge: 33e4e30d0 70a07fa90 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

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