commit 9e81221c96793adfe3c46979ae4f749ff26e3644 Merge: cb3c1f2e5 684d57fe8 Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 11 17:01:00 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)