From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 Feb 2018 01:28:07 +0000 (-0500)
Subject: Merge branch '25162_zstd_static'
X-Git-Tag: tor-0.3.4.1-alpha~280
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1dd8afc16ebeacceb5b4093ef01e2ad8f21ad6c;p=thirdparty%2Ftor.git

Merge branch '25162_zstd_static'
---

a1dd8afc16ebeacceb5b4093ef01e2ad8f21ad6c