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

[nickm at torproject.org]

commit 884c0ffe3b4266e66adbd6bb914c3b3b00401acb
Merge: 3830599 e51e7bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 20:29:00 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22669      |  4 ++++
 changes/bug22672      |  5 ++++
 src/common/compress.c | 44 ++++++++++++++++++++---------------
 src/or/directory.c    | 25 ++++++++++++++++++--
 src/test/test_util.c  | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 121 insertions(+), 20 deletions(-)