commit 8a8b5d590e842c75ac492f4f1ab0a966245cde4a Merge: 0f47507fe 062751236 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 31 14:31:55 2017 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug24082 | 3 +++ src/test/fuzz/fuzzing_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)