commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4 Merge: 8691046ac 36bb11a65 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)