[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'teor/bug22502' into maint-0.3.1

[nickm at torproject.org]

commit 1c0459f19a9abf3b3c33ce28923fb567d5c5dfe1
Merge: eff5e29 7d535ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 10:04:16 2017 -0400

    Merge remote-tracking branch 'teor/bug22502' into maint-0.3.1

 src/common/compress.c      | 28 ++++++++++++++++++++++++--
 src/common/compress_zstd.c | 20 +++++++++++++++----
 src/or/directory.c         | 49 ++++++++++++++++++++++++++++++----------------
 3 files changed, 74 insertions(+), 23 deletions(-)