commit 33d80123ce644cfedcd283ab7f764a84e9f8d930 Merge: a1402bac3 d102e9c2e Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 08:17:25 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug26785 | 4 ++++ configure.ac | 3 +++ src/common/compress_zstd.c | 4 ++++ 3 files changed, 11 insertions(+)