commit da194bb490e3f3e7ad9a06a43d7a007059a0e87f Merge: 890162761 5dc785cee Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 11 16:51:56 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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