commit 81cfd5c9a1af1641d980d5b985810fdd85681fa7 Merge: b421648 d937b86 Author: Nick Mathewson <ni...@torproject.org> Date: Sun Jun 19 12:20:38 2016 -0400
Merge branch 'zlib_coverage_squashed' changes/test_zlib_bombs | 3 ++ changes/zlib_12 | 4 +++ src/common/torgzip.c | 59 ++++++++---------------------------- src/test/test_util.c | 79 +++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 83 insertions(+), 62 deletions(-) _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits