commit abc22e8f1c9ca2c8119ea0b151afe67e8ae96367 Merge: 2cae7c8a2 bac160b4e Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 09:23:57 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

src/common/torgzip.c | 2 ++ 1 file changed, 2 insertions(+)