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

[nickm at torproject.org]

commit d84581a3e677a6905125b619c590488c12a36ae8
Merge: 19f386852 8366be3b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:18:53 2018 -0400

    Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

 changes/bug26272           | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)