commit 5ea9a48ae7acd0d4c6180d13e71570dbb9ef6a6f Merge: 4bd9c5323 cf1e6ad2d Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 11:19:12 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug24247 | 6 ++++++ src/test/fuzz/fuzzing_common.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)