[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit a9a76aa6aea24ff4b838d11b80f808e9174cb678
Merge: dd9f255 392e545
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 13:35:44 2017 -0400

    Merge branch 'maint-0.3.1'

 src/common/compress.c      | 12 ++++++------
 src/common/compress_none.c |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)