commit 2341368515803013934582671bc222c8ca50c306 Merge: c2e546a 1c0459f Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 20 10:06:19 2017 -0400

Merge branch '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(-)