Merge branch '25162_zstd_static'

author Nick Mathewson <nickm@torproject.org>

Fri, 16 Feb 2018 01:28:07 +0000 (20:28 -0500)

committer Nick Mathewson <nickm@torproject.org>

Fri, 16 Feb 2018 01:28:07 +0000 (20:28 -0500)
author Nick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 01:28:07 +0000 (20:28 -0500)
committer Nick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 01:28:07 +0000 (20:28 -0500)
diff --cc configure.ac
Simple merge
diff --cc src/or/main.c
Simple merge
diff --cc src/test/test_util.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Fri, 16 Feb 2018 01:28:07 +0000 (20:28 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 16 Feb 2018 01:28:07 +0000 (20:28 -0500)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test_util.c	patch \|	diff1 \|	diff2 \|	blob \| history