[tor-commits] [tor/release-0.3.1] Merge branch 'bug22672_031' into maint-0.3.1

[nickm at torproject.org]

commit c999e84436a5f7ba1964abd4ae502212f0995bcb
Merge: c4152a2 9328bd5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 20:26:45 2017 -0400

    Merge branch 'bug22672_031' into maint-0.3.1

 changes/bug22672      |  5 +++++
 src/common/compress.c | 36 +++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 11 deletions(-)