commit 43cbcd38968bd3c4cb3fe53af2cdc9b0f74dba3c Merge: f9aed4015 062751236 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 31 14:31:55 2017 -0400

Merge branch 'maint-0.3.2'

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