commit 5dc785ceef465125f180f020991ec2c363bb8abc Merge: 320dac460 0bfd5a659 Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 11 16:51:53 2018 -0500

Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9

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