commit aec52266185782f73725a4df8eabb98d6902584f Merge: f5b9e43d0 25226fb26 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)