commit cf55f0516c9eecc3e2779931fdba9eeb5335f569 Merge: ed13a7f62 eccef6ba6 Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 11 16:51:56 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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